rerere.enabled::
Activate recording of resolved conflicts, so that identical
conflict hunks can be resolved automatically, should they
- be encountered again. See gitlink:git-rerere[1].
+ be encountered again. gitlink:git-rerere[1] command is by
+ default enabled, but can be disabled by setting this option to
+ false.
gitcvs.enabled::
Whether the CVS server interface is enabled for this repository.
<dd>\r
<p>\r
Add modified contents in the working tree interactively to\r
- the index.\r
+ the index. Optional path arguments may be supplied to limit\r
+ operation to a subset of the working tree. See “Interactive\r
+ mode” for details.\r
</p>\r
</dd>\r
+</dl>\r
+<p>-p, --patch:\r
+ Similar to Interactive mode but the initial command loop is\r
+ bypassed and the <em>patch</em> subcommand is invoked using each of\r
+ the specified filepatterns before exiting.</p>\r
+<dl>\r
<dt>\r
-u\r
</dt>\r
J - do not decide on this hunk now, and view the next hunk\r
k - do not decide on this hunk now, and view the previous\r
undecided hunk\r
-K - do not decide on this hunk now, and view the previous hunk</tt></pre>\r
+K - do not decide on this hunk now, and view the previous hunk\r
+s - split the current hunk into smaller hunks\r
+? - print help</tt></pre>\r
</div></div>\r
<p>After deciding the fate for all hunks, if there is any hunk\r
that was chosen, the index is updated with the selected hunks.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:20 UTC\r
+Last updated 05-Dec-2007 10:59:12 UTC\r
</div>\r
</div>\r
</body>\r
-i, \--interactive::
Add modified contents in the working tree interactively to
- the index.
+ the index. Optional path arguments may be supplied to limit
+ operation to a subset of the working tree. See ``Interactive
+ mode'' for details.
+
+-p, \--patch:
+ Similar to Interactive mode but the initial command loop is
+ bypassed and the 'patch' subcommand is invoked using each of
+ the specified filepatterns before exiting.
-u::
Update only files that git already knows about. This is similar
k - do not decide on this hunk now, and view the previous
undecided hunk
K - do not decide on this hunk now, and view the previous hunk
+ s - split the current hunk into smaller hunks
+ ? - print help
+
After deciding the fate for all hunks, if there is any hunk
that was chosen, the index is updated with the selected hunks.
<p>\r
Activate recording of resolved conflicts, so that identical\r
conflict hunks can be resolved automatically, should they\r
- be encountered again. See <a href="git-rerere.html">git-rerere(1)</a>.\r
+ be encountered again. <a href="git-rerere.html">git-rerere(1)</a> command is by\r
+ default enabled, but can be disabled by setting this option to\r
+ false.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Dec-2007 08:28:18 UTC\r
+Last updated 05-Dec-2007 10:59:12 UTC\r
</div>\r
</div>\r
</body>\r
automerge results and corresponding hand-resolve results on the\r
initial manual merge, and later by noticing the same automerge\r
results and applying the previously recorded hand resolution.</p>\r
-<div class="admonitionblock">\r
-<table><tr>\r
-<td class="icon">\r
-<div class="title">Note</div>\r
-</td>\r
-<td class="content">You need to set the config variable rerere.enabled to enable this\r
-command.</td>\r
-</tr></table>\r
-</div>\r
</div>\r
<h2>COMMANDS</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:45 UTC\r
+Last updated 05-Dec-2007 10:59:13 UTC\r
</div>\r
</div>\r
</body>\r
initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution.
-[NOTE]
-You need to set the config variable rerere.enabled to enable this
-command.
-
COMMANDS
--------
and the destination side (after the colon). The ref to be\r
pushed is determined by finding a match that matches the source\r
side, and where it is pushed is determined by using the\r
-destination side.</p>\r
+destination side. The rules used to match a ref are the same\r
+rules used by <a href="git-rev-parse.html">git-rev-parse(1)</a> to resolve a symbolic ref\r
+name.</p>\r
<ul>\r
<li>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:48 UTC\r
+Last updated 05-Dec-2007 10:59:14 UTC\r
</div>\r
</div>\r
</body>\r
and the destination side (after the colon). The ref to be
pushed is determined by finding a match that matches the source
side, and where it is pushed is determined by using the
-destination side.
+destination side. The rules used to match a ref are the same
+rules used by gitlink:git-rev-parse[1] to resolve a symbolic ref
+name.
- It is an error if <src> does not match exactly one of the
local refs.
</li>\r
<li>\r
<p>\r
-The git potty was written by Andres Ericsson <ae@op5.se>.\r
+The git potty was written by Andreas Ericsson <ae@op5.se>.\r
</p>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Dec-2007 08:28:20 UTC\r
+Last updated 05-Dec-2007 10:59:15 UTC\r
</div>\r
</div>\r
</body>\r
-------
* git's founding father is Linus Torvalds <torvalds@osdl.org>.
* The current git nurse is Junio C Hamano <gitster@pobox.com>.
-* The git potty was written by Andres Ericsson <ae@op5.se>.
+* The git potty was written by Andre
as Ericsson <ae@op5.se>.
* General upbringing is handled by the git-list <git@vger.kernel.org>.
Documentation
projects / git.git / commitdiff