pack from a push can make the push operation complete faster,
especially on slow filesystems.
+format.numbered::
+ A boolean which can enable sequence numbers in patch subjects.
+ Seting this option to "auto" will enable it only if there is
+ more than one patch. See --numbered option in
+ gitlink:git-format-patch[1].
+
format.headers::
Additional email headers to include in a patch to be submitted
by mail. See gitlink:git-format-patch[1].
</p>\r
</dd>\r
<dt>\r
+format.numbered\r
+</dt>\r
+<dd>\r
+<p>\r
+ A boolean which can enable sequence numbers in patch subjects.\r
+ Seting this option to "auto" will enable it only if there is\r
+ more than one patch. See --numbered option in\r
+ <a href="git-format-patch.html">git-format-patch(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
format.headers\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:25 UTC\r
+Last updated 15-Nov-2007 00:12:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>\r
+<p><em>git-cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<p>Exports a commit from GIT to a CVS checkout, making it easier\r
to merge patches from a git repository into a CVS repository.</p>\r
-<p>Execute it from the root of the CVS working copy. GIT_DIR must be defined.\r
-See examples below.</p>\r
+<p>Specify the name of a CVS checkout using the -w switch or execute it\r
+from the root of the CVS working copy. In the latter case GIT_DIR must\r
+be defined. See examples below.</p>\r
<p>It does its best to do the safe thing, it will check that the files are\r
unchanged and up to date in the CVS checkout, and it will not autocommit\r
by default.</p>\r
</p>\r
</dd>\r
<dt>\r
+-w\r
+</dt>\r
+<dd>\r
+<p>\r
+ Specify the location of the CVS checkout to use for the export. This\r
+ option does not require GIT_DIR to be set before execution if the\r
+ current directory is within a git repository.\r
+</p>\r
+</dd>\r
+<dt>\r
-v\r
</dt>\r
<dd>\r
</div></div>\r
</dd>\r
<dt>\r
+Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo\r
+</dt>\r
+<dd>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> $ git-cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1></tt></pre>\r
+</div></div>\r
+</dd>\r
+<dt>\r
Merge pending patches into CVS automatically — only if you really know what you are doing\r
</dt>\r
<dd>\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Martin Langhoff <martin@catalyst.net.nz></p>\r
+<p>Written by Martin Langhoff <martin@catalyst.net.nz> and others.</p>\r
</div>\r
<h2>Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Martin Langhoff <martin@catalyst.net.nz></p>\r
+<p>Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.</p>\r
</div>\r
<h2>GIT</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:26 UTC\r
+Last updated 15-Nov-2007 00:12:54 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
DESCRIPTION
Exports a commit from GIT to a CVS checkout, making it easier
to merge patches from a git repository into a CVS repository.
-Execute it from the root of the CVS working copy. GIT_DIR must be defined.
-See examples below.
+Specify the name of a CVS checkout using the -w switch or execute it
+from the root of the CVS working copy. In the latter case GIT_DIR must
+be defined. See examples below.
It does its best to do the safe thing, it will check that the files are
unchanged and up to date in the CVS checkout, and it will not autocommit
-u::
Update affected files from CVS repository before attempting export.
+-w::
+ Specify the location of the CVS checkout to use for the export. This
+ option does not require GIT_DIR to be set before execution if the
+ current directory is within a git repository.
+
-v::
Verbose.
$ cvs commit -F .msg <files>
------------
+Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo::
++
+------------
+ $ git-cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>
+------------
+
Merge pending patches into CVS automatically -- only if you really know what you are doing::
+
------------
Author
------
-Written by Martin Langhoff <martin@catalyst.net.nz>
+Written by Martin Langhoff <martin@catalyst.net.nz> and others.
Documentation
--------------
-Documentation by Martin Langhoff <martin@catalyst.net.nz>
+Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.
GIT
---
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
<div class="verseblock">\r
-<div class="content"><em>git-format-patch</em> [-n | -k] [-o <dir> | --stdout] [--thread]\r
+<div class="content"><em>git-format-patch</em> [-k] [-o <dir> | --stdout] [--thread]\r
[--attach[=<boundary>] | --inline[=<boundary>]]\r
[-s | --signoff] [<common diff options>]\r
+ [-n | --numbered | -N | --no-numbered]\r
[--start-number <n>] [--numbered-files]\r
[--in-reply-to=Message-Id] [--suffix=.<sfx>]\r
[--ignore-if-in-upstream]\r
</p>\r
</dd>\r
<dt>\r
+-N|--no-numbered\r
+</dt>\r
+<dd>\r
+<p>\r
+ Name output in <em>[PATCH]</em> format.\r
+</p>\r
+</dd>\r
+<dt>\r
--start-number <n>\r
</dt>\r
<dd>\r
</div>\r
<h2>CONFIGURATION</h2>\r
<div class="sectionbody">\r
-<p>You can specify extra mail header lines to be added to each\r
-message in the repository configuration. You can also specify\r
-new defaults for the subject prefix and file suffix.</p>\r
+<p>You can specify extra mail header lines to be added to each message\r
+in the repository configuration, new defaults for the subject prefix\r
+and file suffix, and number patches when outputting more than one.</p>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>[format]\r
headers = "Organization: git-foo\n"\r
subjectprefix = CHANGE\r
- suffix = .txt</tt></pre>\r
+ suffix = .txt\r
+ numbered = auto</tt></pre>\r
</div></div>\r
</div>\r
<h2>EXAMPLES</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:31 UTC\r
+Last updated 15-Nov-2007 00:12:54 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
[verse]
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--thread]
+'git-format-patch' [-k] [-o <dir> | --stdout] [--thread]
[--attach[=<boundary>] | --inline[=<boundary>]]
[-s | --signoff] [<common diff options>]
+ [-n | --numbered | -N | --no-numbered]
[--start-number <n>] [--numbered-files]
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
[--ignore-if-in-upstream]
-n|--numbered::
Name output in '[PATCH n/m]' format.
+-N|--no-numbered::
+ Name output in '[PATCH]' format.
+
--start-number <n>::
Start numbering the patches at <n> instead of 1.
CONFIGURATION
-------------
-You can specify extra mail header lines to be added to each
-message in the repository configuration. You can also specify
-new defaults for the subject prefix and file suffix.
+You can specify extra mail header lines to be added to each message
+in the repository configuration, new defaults for the subject prefix
+and file suffix, and number patches when outputting more than one.
------------
[format]
headers = "Organization: git-foo\n"
subjectprefix = CHANGE
suffix = .txt
+ numbered = auto
------------
[ --not ]\r
[ --all ]\r
[ --stdin ]\r
+ [ --quiet ]\r
[ --topo-order ]\r
[ --parents ]\r
[ --timestamp ]\r
</p>\r
</dd>\r
<dt>\r
+--quiet\r
+</dt>\r
+<dd>\r
+<p>\r
+ Don't print anything to standard output. This form of\r
+ git-rev-list is primarly meant to allow the caller to\r
+ test the exit status to see if a range of objects is fully\r
+ connected (or not). It is faster than redirecting stdout\r
+ to /dev/null as the output does not have to be formatted.\r
+</p>\r
+</dd>\r
+<dt>\r
--cherry-pick\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:46 UTC\r
+Last updated 15-Nov-2007 00:12:55 UTC\r
</div>\r
</div>\r
</body>\r
[ \--not ]
[ \--all ]
[ \--stdin ]
+ [ \--quiet ]
[ \--topo-order ]
[ \--parents ]
[ \--timestamp ]
In addition to the '<commit>' listed on the command
line, read them from the standard input.
+--quiet::
+
+ Don't print anything to standard output. This form of
+ git-rev-list is primarly meant to allow the caller to
+ test the exit status to see if a range of objects is fully
+ connected (or not). It is faster than redirecting stdout
+ to /dev/null as the output does not have to be formatted.
+
--cherry-pick::
Omit any commit that introduces the same change as
state with</p><div class="literallayout"><p>$ git reset --hard HEAD</p></div><p>If you make a commit that you later wish you hadn't, there are two
fundamentally different ways to fix the problem:</p><div class="orderedlist"><ol type="1"><li>
You can create a new commit that undoes whatever was done
- by the previous commit. This is the correct thing if your
+ by the old commit. This is the correct thing if your
mistake has already been made public.
</li><li>
You can go back and modify the old commit. You should
realize that the branch was the only reference you had to that point in
history.</p><p>Fortunately, git also keeps a log, called a "reflog", of all the
previous values of each branch. So in this case you can still find the
-old history using, for example,</p><div class="literallayout"><p>$ git log master@{1}</p></div><p>This lists the commits reachable from the previous version of the branch.
+old history using, for example,</p><div class="literallayout"><p>$ git log master@{1}</p></div><p>This lists the commits reachable from the previous version of the head.
This syntax can be used with any git command that accepts a commit,
not just with git log. Some other examples:</p><div class="literallayout"><p>$ git show master@{2} # See where the branch pointed 2,<br>
$ git show master@{3} # 3, ... changes ago.<br>
fundamentally different ways to fix the problem:
1. You can create a new commit that undoes whatever was done
- by the previous commit. This is the correct thing if your
+ by the old commit. This is the correct thing if your
mistake has already been made public.
2. You can go back and modify the old commit. You should
$ git log master@{1}
-------------------------------------------------
-This lists the commits reachable from the previous version of the branch.
+This lists the commits reachable from the previous version of the head.
This syntax can be used with any git command that accepts a commit,
not just with git log. Some other examples:
projects / git.git / commitdiff