LF at the end of lines. Currently, which paths to consider
'text' (i.e. be subjected to the autocrlf mechanism) is
decided purely based on the contents, but the plan is to
- allow users to explicitly override this heuristics based on
+ allow users to explicitly override this heuristic based on
paths.
- The behaviour of 'git-apply', when run in a subdirectory,
</p>\r
</dd>\r
<dt>\r
-\i, --interactive\r
+-i, --interactive\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Jan-2007 20:25:04 UTC\r
+Last updated 02-Mar-2007 10:34:18 UTC\r
</div>\r
</div>\r
</body>\r
-f::
Allow adding otherwise ignored files.
-\i, \--interactive::
+-i, \--interactive::
Add modified contents in the working tree interactively to
the index.
<p>Some workflows require that one or more branches of development on one\r
machine be replicated on another machine, but the two machines cannot\r
be directly connected so the interactive git protocols (git, ssh,\r
-rsync, http) cannot be used. This command provides suport for\r
+rsync, http) cannot be used. This command provides support for\r
git-fetch and git-pull to operate by packaging objects and references\r
in an archive at the originating machine, then importing those into\r
another repository using <a href="git-fetch.html">git-fetch(1)</a> and <a href="git-pull.html">git-pull(1)</a>\r
</dt>\r
<dd>\r
<p>\r
- A list of arguments, accepatble to git-rev-parse and\r
+ A list of arguments, acceptable to git-rev-parse and\r
git-rev-list, that specify the specific objects and references\r
to transport. For example, "master~10..master" causes the\r
current master reference to be packaged along with all objects\r
<p>\r
A list of references used to limit the references reported as\r
available. This is principally of use to git-fetch, which\r
- expects to recieve only those references asked for and not\r
+ expects to receive only those references asked for and not\r
necessarily everything in the pack (in this case, git-bundle is\r
acting like <a href="git-fetch-pack.html">git-fetch-pack(1)</a>).\r
</p>\r
specified explicitly (e.g., ^master~10), or implicitly (e.g.,\r
master~10..master, master --since=10.days.ago).</p>\r
<p>It is very important that the basis used be held by the destination.\r
-It is ok to err on the side of conservatism, causing the bundle file\r
+It is okay to err on the side of conservatism, causing the bundle file\r
to contain objects already in the destination as these are ignored\r
when unpacking at the destination.</p>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 01-Mar-2007 01:24:42 UTC\r
+Last updated 02-Mar-2007 10:34:19 UTC\r
</div>\r
</div>\r
</body>\r
Some workflows require that one or more branches of development on one
machine be replicated on another machine, but the two machines cannot
be directly connected so the interactive git protocols (git, ssh,
-rsync, http) cannot be used. This command provides suport for
+rsync, http) cannot be used. This command provides support for
git-fetch and git-pull to operate by packaging objects and references
in an archive at the originating machine, then importing those into
another repository using gitlink:git-fetch[1] and gitlink:git-pull[1]
gitlink:git-fetch[1].
[git-rev-list-args...]::
- A list of arguments, accepatble to git-rev-parse and
+ A list of arguments, acceptable to git-rev-parse and
git-rev-list, that specify the specific objects and references
to transport. For example, "master~10..master" causes the
current master reference to be packaged along with all objects
[refname...]::
A list of references used to limit the references reported as
available. This is principally of use to git-fetch, which
- expects to recieve only those references asked for and not
+ expects to receive only those references asked for and not
necessarily everything in the pack (in this case, git-bundle is
acting like gitlink:git-fetch-pack[1]).
master~10..master, master --since=10.days.ago).
It is very important that the basis used be held by the destination.
-It is ok to err on the side of conservatism, causing the bundle file
+It is okay to err on the side of conservatism, causing the bundle file
to contain objects already in the destination as these are ignored
when unpacking at the destination.
true parent commits, without taking grafts nor history\r
simplification into account.</p>\r
</li>\r
+<li>\r
+<p>\r
+<em>format:</em>\r
+</p>\r
+<p>The <em>format:</em> format allows you to specify which information\r
+you want to show. It works a little bit like printf format,\r
+with the notable exception that you get a newline with <em>%n</em>\r
+instead of <em>\n</em>.</p>\r
+</li>\r
</ul>\r
</dd>\r
+</dl>\r
+<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<"</em>\r
+would show something like this:</p>\r
+<p>The author of fe6e0ee was Junio C Hamano, 23 hours ago\r
+The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</p>\r
+<p>The placeholders are:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>%H</em>: commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%h</em>: abbreviated commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%T</em>: tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%t</em>: abbreviated tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%P</em>: parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%p</em>: abbreviated parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%an</em>: author name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ae</em>: author email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ad</em>: author date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%aD</em>: author date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ar</em>: author date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%at</em>: author date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cn</em>: committer name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ce</em>: committer email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cd</em>: committer date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cD</em>: committer date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cr</em>: committer date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ct</em>: committer date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%e</em>: encoding\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%s</em>: subject\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%b</em>: body\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cred</em>: switch color to red\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cgreen</em>: switch color to green\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cblue</em>: switch color to blue\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Creset</em>: reset color\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%n</em>: newline\r
+</p>\r
+<dl>\r
<dt>\r
--encoding[=<encoding>]\r
</dt>\r
</p>\r
</dd>\r
</dl>\r
+</li>\r
+</ul>\r
</div>\r
<h2>Limiting Output</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Feb-2007 23:44:51 UTC\r
+Last updated 02-Mar-2007 10:34:19 UTC\r
</div>\r
</div>\r
</body>\r
true parent commits, without taking grafts nor history\r
simplification into account.</p>\r
</li>\r
+<li>\r
+<p>\r
+<em>format:</em>\r
+</p>\r
+<p>The <em>format:</em> format allows you to specify which information\r
+you want to show. It works a little bit like printf format,\r
+with the notable exception that you get a newline with <em>%n</em>\r
+instead of <em>\n</em>.</p>\r
+</li>\r
</ul>\r
</dd>\r
+</dl>\r
+<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<"</em>\r
+would show something like this:</p>\r
+<p>The author of fe6e0ee was Junio C Hamano, 23 hours ago\r
+The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</p>\r
+<p>The placeholders are:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>%H</em>: commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%h</em>: abbreviated commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%T</em>: tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%t</em>: abbreviated tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%P</em>: parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%p</em>: abbreviated parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%an</em>: author name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ae</em>: author email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ad</em>: author date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%aD</em>: author date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ar</em>: author date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%at</em>: author date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cn</em>: committer name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ce</em>: committer email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cd</em>: committer date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cD</em>: committer date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cr</em>: committer date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ct</em>: committer date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%e</em>: encoding\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%s</em>: subject\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%b</em>: body\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cred</em>: switch color to red\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cgreen</em>: switch color to green\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cblue</em>: switch color to blue\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Creset</em>: reset color\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%n</em>: newline\r
+</p>\r
+<dl>\r
<dt>\r
--encoding[=<encoding>]\r
</dt>\r
</p>\r
</dd>\r
</dl>\r
+</li>\r
+</ul>\r
</div>\r
<h2>Examples</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Feb-2007 05:35:41 UTC\r
+Last updated 02-Mar-2007 10:34:20 UTC\r
</div>\r
</div>\r
</body>\r
The directory to find the quilt patches and the\r
quilt series file.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>The default for the patch directory is patches\r
+<p>The default for the patch directory is patches\r
or the value of the $QUILT_PATCHES environment\r
-variable.</tt></pre>\r
-</div></div>\r
+variable.</p>\r
</dd>\r
</dl>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:19 UTC\r
+Last updated 02-Mar-2007 10:34:21 UTC\r
</div>\r
</div>\r
</body>\r
--patches <dir>::
The directory to find the quilt patches and the
quilt series file.
-
- The default for the patch directory is patches
- or the value of the $QUILT_PATCHES environment
- variable.
++
+The default for the patch directory is patches
+or the value of the $QUILT_PATCHES environment
+variable.
Author
------
true parent commits, without taking grafts nor history\r
simplification into account.</p>\r
</li>\r
+<li>\r
+<p>\r
+<em>format:</em>\r
+</p>\r
+<p>The <em>format:</em> format allows you to specify which information\r
+you want to show. It works a little bit like printf format,\r
+with the notable exception that you get a newline with <em>%n</em>\r
+instead of <em>\n</em>.</p>\r
+</li>\r
</ul>\r
</dd>\r
+</dl>\r
+<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<"</em>\r
+would show something like this:</p>\r
+<p>The author of fe6e0ee was Junio C Hamano, 23 hours ago\r
+The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</p>\r
+<p>The placeholders are:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>%H</em>: commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%h</em>: abbreviated commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%T</em>: tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%t</em>: abbreviated tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%P</em>: parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%p</em>: abbreviated parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%an</em>: author name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ae</em>: author email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ad</em>: author date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%aD</em>: author date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ar</em>: author date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%at</em>: author date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cn</em>: committer name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ce</em>: committer email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cd</em>: committer date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cD</em>: committer date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cr</em>: committer date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ct</em>: committer date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%e</em>: encoding\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%s</em>: subject\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%b</em>: body\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cred</em>: switch color to red\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cgreen</em>: switch color to green\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cblue</em>: switch color to blue\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Creset</em>: reset color\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%n</em>: newline\r
+</p>\r
+<dl>\r
<dt>\r
--encoding[=<encoding>]\r
</dt>\r
</p>\r
</dd>\r
</dl>\r
+</li>\r
+</ul>\r
<h3>Diff Formatting</h3>\r
<p>Below are listed options that control the formatting of diff output.\r
Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Feb-2007 07:23:35 UTC\r
+Last updated 02-Mar-2007 10:34:21 UTC\r
</div>\r
</div>\r
</body>\r
<p>\r
Specify a "Bcc:" value for each email.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>The --bcc option must be repeated for each user you want on the bcc list.</tt></pre>\r
-</div></div>\r
+<p>The --bcc option must be repeated for each user you want on the bcc list.</p>\r
</dd>\r
<dt>\r
--cc\r
<p>\r
Specify a starting "Cc:" value for each email.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>The --cc option must be repeated for each user you want on the cc list.</tt></pre>\r
-</div></div>\r
+<p>The --cc option must be repeated for each user you want on the cc list.</p>\r
</dd>\r
<dt>\r
--chain-reply-to, --no-chain-reply-to\r
Generally, this will be the upstream maintainer of the\r
project involved.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>The --to option must be repeated for each user you want on the to list.</tt></pre>\r
-</div></div>\r
+<p>The --to option must be repeated for each user you want on the to list.</p>\r
</dd>\r
</dl>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Oct-2006 20:47:13 UTC\r
+Last updated 02-Mar-2007 10:34:22 UTC\r
</div>\r
</div>\r
</body>\r
--bcc::
Specify a "Bcc:" value for each email.
-
- The --bcc option must be repeated for each user you want on the bcc list.
++
+The --bcc option must be repeated for each user you want on the bcc list.
--cc::
Specify a starting "Cc:" value for each email.
-
- The --cc option must be repeated for each user you want on the cc list.
++
+The --cc option must be repeated for each user you want on the cc list.
--chain-reply-to, --no-chain-reply-to::
If this is set, each email will be sent as a reply to the previous
Specify the primary recipient of the emails generated.
Generally, this will be the upstream maintainer of the
project involved.
-
- The --to option must be repeated for each user you want on the to list.
++
+The --to option must be repeated for each user you want on the to list.
Author
true parent commits, without taking grafts nor history\r
simplification into account.</p>\r
</li>\r
+<li>\r
+<p>\r
+<em>format:</em>\r
+</p>\r
+<p>The <em>format:</em> format allows you to specify which information\r
+you want to show. It works a little bit like printf format,\r
+with the notable exception that you get a newline with <em>%n</em>\r
+instead of <em>\n</em>.</p>\r
+</li>\r
</ul>\r
</dd>\r
+</dl>\r
+<p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<"</em>\r
+would show something like this:</p>\r
+<p>The author of fe6e0ee was Junio C Hamano, 23 hours ago\r
+The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</p>\r
+<p>The placeholders are:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>%H</em>: commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%h</em>: abbreviated commit hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%T</em>: tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%t</em>: abbreviated tree hash\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%P</em>: parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%p</em>: abbreviated parent hashes\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%an</em>: author name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ae</em>: author email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ad</em>: author date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%aD</em>: author date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ar</em>: author date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%at</em>: author date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cn</em>: committer name\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ce</em>: committer email\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cd</em>: committer date\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cD</em>: committer date, RFC2822 style\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%cr</em>: committer date, relative\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%ct</em>: committer date, UNIX timestamp\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%e</em>: encoding\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%s</em>: subject\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%b</em>: body\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cred</em>: switch color to red\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cgreen</em>: switch color to green\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Cblue</em>: switch color to blue\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%Creset</em>: reset color\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>%n</em>: newline\r
+</p>\r
+<dl>\r
<dt>\r
--encoding[=<encoding>]\r
</dt>\r
</p>\r
</dd>\r
</dl>\r
+</li>\r
+</ul>\r
</div>\r
<h2>EXAMPLES</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 28-Feb-2007 08:13:34 UTC\r
+Last updated 02-Mar-2007 10:34:23 UTC\r
</div>\r
</div>\r
</body>\r
transports (eg svn+ssh://), you must include the username in\r
the URL, eg svn+ssh://foo@svn.bar.com/project\r
</p>\r
-<p>--prefix=<prefix>\r
+</dd>\r
+<dt>\r
+--prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
This allows one to specify a prefix which is prepended\r
to the names of remotes if trunk/branches/tags are\r
specified. The prefix does not automatically include a\r
trailing slash, so be sure you include one in the\r
argument if that is what you want. This is useful if\r
you wish to track multiple projects that share a common\r
- repository.</p>\r
+ repository.\r
+</p>\r
</dd>\r
<dt>\r
<em>fetch</em>\r
This fetches revisions from the SVN parent of the current HEAD\r
and rebases the current (uncommitted to SVN) work against it.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>This works similarly to 'svn update' or 'git-pull' except that\r
-it preserves linear history with 'git-rebase' instead of\r
-'git-merge' for ease of dcommit-ing with git-svn.</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>This accepts all options that 'git-svn fetch' and 'git-rebase'\r
-accepts. However '--fetch-all' only fetches from the current\r
-[svn-remote], and not all [svn-remote] definitions.</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>Like 'git-rebase'; this requires that the working tree be clean\r
-and have no uncommitted changes.</tt></pre>\r
-</div></div>\r
+<p>This works similarly to <em>svn update</em> or <em>git-pull</em> except that\r
+it preserves linear history with <em>git-rebase</em> instead of\r
+<em>git-merge</em> for ease of dcommit-ing with git-svn.</p>\r
+<p>This accepts all options that <em>git-svn fetch</em> and <em>git-rebase</em>\r
+accepts. However <em>--fetch-all</em> only fetches from the current\r
+[svn-remote], and not all [svn-remote] definitions.</p>\r
+<p>Like <em>git-rebase</em>; this requires that the working tree be clean\r
+and have no uncommitted changes.</p>\r
</dd>\r
<dt>\r
<em>dcommit</em>\r
cleaner, more linear history.\r
</p>\r
</dd>\r
+</dl>\r
+<dl>\r
<dt>\r
<em>log</em>\r
</dt>\r
This should make it easy to look up svn log messages when svn\r
users refer to -r/--revision numbers.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>The following features from `svn log' are supported:</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>--revision=<n>[:<n>] - is supported, non-numeric args are not:\r
- HEAD, NEXT, BASE, PREV, etc ...\r
--v/--verbose - it's not completely compatible with\r
- the --verbose output in svn log, but\r
- reasonably close.\r
---limit=<n> - is NOT the same as --max-count,\r
- doesn't count merged/excluded commits\r
---incremental - supported</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>New features:</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>--show-commit - shows the git commit sha1, as well\r
---oneline - our version of --pretty=oneline</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>Any other arguments are passed directly to `git log'</tt></pre>\r
-</div></div>\r
+<p>The following features from `svn log' are supported:</p>\r
+<dl>\r
+<dt>\r
+--revision=<n>[:<n>]\r
+</dt>\r
+<dd>\r
+<p>\r
+ is supported, non-numeric args are not:\r
+ HEAD, NEXT, BASE, PREV, etc …\r
+</p>\r
+</dd>\r
+<dt>\r
+-v/--verbose\r
+</dt>\r
+<dd>\r
+<p>\r
+ it's not completely compatible with the --verbose\r
+ output in svn log, but reasonably close.\r
+</p>\r
+</dd>\r
+<dt>\r
+--limit=<n>\r
+</dt>\r
+<dd>\r
+<p>\r
+ is NOT the same as --max-count, doesn't count\r
+ merged/excluded commits\r
+</p>\r
</dd>\r
<dt>\r
+--incremental\r
+</dt>\r
+<dd>\r
+<p>\r
+ supported\r
+</p>\r
+</dd>\r
+</dl>\r
+<p>New features:</p>\r
+<dl>\r
+<dt>\r
+--show-commit\r
+</dt>\r
+<dd>\r
+<p>\r
+ shows the git commit sha1, as well\r
+</p>\r
+</dd>\r
+<dt>\r
+--oneline\r
+</dt>\r
+<dd>\r
+<p>\r
+ our version of --pretty=oneline\r
+</p>\r
+</dd>\r
+</dl>\r
+<p>Any other arguments are passed directly to `git log'</p>\r
+</dd>\r
+</dl>\r
+<dl>\r
+<dt>\r
<em>set-tree</em>\r
</dt>\r
<dd>\r
<dt>\r
--repack[=<n>]\r
</dt>\r
+<dt>\r
+--repack-flags=<flags>\r
+</dt>\r
<dd>\r
<p>\r
---repack-flags=<flags>\r
- These should help keep disk usage sane for large fetches\r
- with many revisions.\r
+These should help keep disk usage sane for large fetches\r
+with many revisions.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>--repack takes an optional argument for the number of revisions\r
+<p>--repack takes an optional argument for the number of revisions\r
to fetch before repacking. This defaults to repacking every\r
-1000 commits fetched if no argument is specified.</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>--repack-flags are passed directly to gitlink:git-repack[1].</tt></pre>\r
-</div></div>\r
-<p>config key: svn.repack\r
-config key: svn.repackflags</p>\r
+1000 commits fetched if no argument is specified.</p>\r
+<p>--repack-flags are passed directly to <a href="git-repack.html">git-repack(1)</a>.</p>\r
+<div class="verseblock">\r
+<div class="content">config key: svn.repack\r
+config key: svn.repackflags</div></div>\r
</dd>\r
<dt>\r
-m\r
</dt>\r
<dd>\r
<p>\r
- This gets rid of the git-svn-id: lines at the end of every commit.\r
+This gets rid of the git-svn-id: lines at the end of every commit.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>If you lose your .git/svn/git-svn/.rev_db file, git-svn will not\r
+<p>If you lose your .git/svn/git-svn/.rev_db file, git-svn will not\r
be able to rebuild it and you won't be able to fetch again,\r
-either. This is fine for one-shot imports.</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>The 'git-svn log' command will not work on repositories using\r
-this, either. Using this conflicts with the 'useSvmProps'\r
-option for (hopefully) obvious reasons.</tt></pre>\r
-</div></div>\r
+either. This is fine for one-shot imports.</p>\r
+<p>The <em>git-svn log</em> command will not work on repositories using\r
+this, either. Using this conflicts with the <em>useSvmProps</em>\r
+option for (hopefully) obvious reasons.</p>\r
</dd>\r
<dt>\r
svn.useSvmProps\r
</dt>\r
<dd>\r
<p>\r
- This allows git-svn to re-map repository URLs and UUIDs from\r
- mirrors created using SVN::Mirror (or svk) for metadata.\r
+This allows git-svn to re-map repository URLs and UUIDs from\r
+mirrors created using SVN::Mirror (or svk) for metadata.\r
</p>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>If an SVN revision has a property, "svm:headrev", it is likely\r
+<p>If an SVN revision has a property, "svm:headrev", it is likely\r
that the revision was created by SVN::Mirror (also used by SVK).\r
The property contains a repository UUID and a revision. We want\r
to make it look like we are mirroring the original URL, so\r
introduce a helper function that returns the original identity\r
URL and UUID, and use it when generating metadata in commit\r
-messages.</tt></pre>\r
-</div></div>\r
+messages.</p>\r
</dd>\r
<dt>\r
svn.useSvnsyncProps\r
section because they affect the <em>git-svn-id:</em> metadata line.</p>\r
</dd>\r
</dl>\r
-<h3>Basic Examples</h3>\r
+</div>\r
+<h2>BASIC EXAMPLES</h2>\r
+<div class="sectionbody">\r
<p>Tracking and contributing to a the trunk of a Subversion-managed project:</p>\r
<div class="listingblock">\r
<div class="content">\r
# with the appropriate name):\r
git reset --hard remotes/trunk\r
# You may only dcommit to one branch/tag/trunk at a time. The usage\r
-# of dcommit/rebase/show-ignore should be teh same as above.</tt></pre>\r
+# of dcommit/rebase/show-ignore should be the same as above.</tt></pre>\r
</div></div>\r
</div>\r
<h2>REBASE VS. PULL/MERGE</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Feb-2007 11:13:37 UTC\r
+Last updated 02-Mar-2007 10:34:23 UTC\r
</div>\r
</div>\r
</body>\r
transports (eg svn+ssh://), you must include the username in
the URL, eg svn+ssh://foo@svn.bar.com/project
---prefix=<prefix>
+--prefix=<prefix>::
This allows one to specify a prefix which is prepended
to the names of remotes if trunk/branches/tags are
specified. The prefix does not automatically include a
This fetches revisions from the SVN parent of the current HEAD
and rebases the current (uncommitted to SVN) work against it.
- This works similarly to 'svn update' or 'git-pull' except that
- it preserves linear history with 'git-rebase' instead of
- 'git-merge' for ease of dcommit-ing with git-svn.
+This works similarly to 'svn update' or 'git-pull' except that
+it preserves linear history with 'git-rebase' instead of
+'git-merge' for ease of dcommit-ing with git-svn.
- This accepts all options that 'git-svn fetch' and 'git-rebase'
- accepts. However '--fetch-all' only fetches from the current
- [svn-remote], and not all [svn-remote] definitions.
+This accepts all options that 'git-svn fetch' and 'git-rebase'
+accepts. However '--fetch-all' only fetches from the current
+[svn-remote], and not all [svn-remote] definitions.
- Like 'git-rebase'; this requires that the working tree be clean
- and have no uncommitted changes.
+Like 'git-rebase'; this requires that the working tree be clean
+and have no uncommitted changes.
'dcommit'::
Commit each diff from a specified head directly to the SVN
alternative to HEAD.
This is advantageous over 'set-tree' (below) because it produces
cleaner, more linear history.
+--
'log'::
This should make it easy to look up svn log messages when svn
users refer to -r/--revision numbers.
++
+The following features from `svn log' are supported:
++
+--
+--revision=<n>[:<n>];;
+ is supported, non-numeric args are not:
+ HEAD, NEXT, BASE, PREV, etc ...
+-v/--verbose;;
+ it's not completely compatible with the --verbose
+ output in svn log, but reasonably close.
+--limit=<n>;;
+ is NOT the same as --max-count, doesn't count
+ merged/excluded commits
+--incremental;;
+ supported
+--
++
+New features:
++
+--
+--show-commit;;
+ shows the git commit sha1, as well
+--oneline;;
+ our version of --pretty=oneline
+--
++
+Any other arguments are passed directly to `git log'
- The following features from `svn log' are supported:
-
- --revision=<n>[:<n>] - is supported, non-numeric args are not:
- HEAD, NEXT, BASE, PREV, etc ...
- -v/--verbose - it's not completely compatible with
- the --verbose output in svn log, but
- reasonably close.
- --limit=<n> - is NOT the same as --max-count,
- doesn't count merged/excluded commits
- --incremental - supported
-
- New features:
-
- --show-commit - shows the git commit sha1, as well
- --oneline - our version of --pretty=oneline
-
- Any other arguments are passed directly to `git log'
-
+--
'set-tree'::
You should consider using 'dcommit' instead of this command.
Commit specified commit or tree objects to SVN. This relies on
Make git-svn less verbose.
--repack[=<n>]::
---repack-flags=<flags>
- These should help keep disk usage sane for large fetches
- with many revisions.
+--repack-flags=<flags>::
+
+These should help keep disk usage sane for large fetches
+with many revisions.
- --repack takes an optional argument for the number of revisions
- to fetch before repacking. This defaults to repacking every
- 1000 commits fetched if no argument is specified.
+--repack takes an optional argument for the number of revisions
+to fetch before repacking. This defaults to repacking every
+1000 commits fetched if no argument is specified.
- --repack-flags are passed directly to gitlink:git-repack[1].
+--repack-flags are passed directly to gitlink:git-repack[1].
+[verse]
config key: svn.repack
config key: svn.repackflags
svn.noMetadata::
svn-remote.<name>.noMetadata::
- This gets rid of the git-svn-id: lines at the end of every commit.
- If you lose your .git/svn/git-svn/.rev_db file, git-svn will not
- be able to rebuild it and you won't be able to fetch again,
- either. This is fine for one-shot imports.
+This gets rid of the git-svn-id: lines at the end of every commit.
+
+If you lose your .git/svn/git-svn/.rev_db file, git-svn will not
+be able to rebuild it and you won't be able to fetch again,
+either. This is fine for one-shot imports.
- The 'git-svn log' command will not work on repositories using
- this, either. Using this conflicts with the 'useSvmProps'
- option for (hopefully) obvious reasons.
+The 'git-svn log' command will not work on repositories using
+this, either. Using this conflicts with the 'useSvmProps'
+option for (hopefully) obvious reasons.
svn.useSvmProps::
svn-remote.<name>.useSvmProps::
- This allows git-svn to re-map repository URLs and UUIDs from
- mirrors created using SVN::Mirror (or svk) for metadata.
- If an SVN revision has a property, "svm:headrev", it is likely
- that the revision was created by SVN::Mirror (also used by SVK).
- The property contains a repository UUID and a revision. We want
- to make it look like we are mirroring the original URL, so
- introduce a helper function that returns the original identity
- URL and UUID, and use it when generating metadata in commit
- messages.
+This allows git-svn to re-map repository URLs and UUIDs from
+mirrors created using SVN::Mirror (or svk) for metadata.
+
+If an SVN revision has a property, "svm:headrev", it is likely
+that the revision was created by SVN::Mirror (also used by SVK).
+The property contains a repository UUID and a revision. We want
+to make it look like we are mirroring the original URL, so
+introduce a helper function that returns the original identity
+URL and UUID, and use it when generating metadata in commit
+messages.
svn.useSvnsyncProps::
svn-remote.<name>.useSvnsyncprops::
--
-Basic Examples
-~~~~~~~~~~~~~~
+BASIC EXAMPLES
+--------------
Tracking and contributing to a the trunk of a Subversion-managed project:
# with the appropriate name):
git reset --hard remotes/trunk
# You may only dcommit to one branch/tag/trunk at a time. The usage
-# of dcommit/rebase/show-ignore should be teh same as above.
+# of dcommit/rebase/show-ignore should be the same as above.
------------------------------------------------------------------------
REBASE VS. PULL/MERGE
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 01-Mar-2007 01:24:44 UTC\r
+Last updated 02-Mar-2007 10:34:24 UTC\r
</div>\r
</div>\r
</body>\r
true parent commits, without taking grafts nor history
simplification into account.
+ * 'format:'
++
+The 'format:' format allows you to specify which information
+you want to show. It works a little bit like printf format,
+with the notable exception that you get a newline with '%n'
+instead of '\n'.
+
+E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<"'
+would show something like this:
+
+The author of fe6e0ee was Junio C Hamano, 23 hours ago
+The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
+
+The placeholders are:
+
+- '%H': commit hash
+- '%h': abbreviated commit hash
+- '%T': tree hash
+- '%t': abbreviated tree hash
+- '%P': parent hashes
+- '%p': abbreviated parent hashes
+- '%an': author name
+- '%ae': author email
+- '%ad': author date
+- '%aD': author date, RFC2822 style
+- '%ar': author date, relative
+- '%at': author date, UNIX timestamp
+- '%cn': committer name
+- '%ce': committer email
+- '%cd': committer date
+- '%cD': committer date, RFC2822 style
+- '%cr': committer date, relative
+- '%ct': committer date, UNIX timestamp
+- '%e': encoding
+- '%s': subject
+- '%b': body
+- '%Cred': switch color to red
+- '%Cgreen': switch color to green
+- '%Cblue': switch color to blue
+- '%Creset': reset color
+- '%n': newline
+
+
--encoding[=<encoding>]::
The commit objects record the encoding used for the log message
in their encoding header; this option can be used to tell the
command to re-code the commit log message in the encoding
preferred by the user. For non plumbing commands this
defaults to UTF-8.
+
projects / git.git / commitdiff