From: Junio C Hamano Date: Wed, 5 Dec 2007 10:59:48 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.7-1066-g7a4a X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0facb91f036fe57e82a8d55f86a0a387b8562e6;p=git.git Autogenerated HTML docs for v1.5.3.7-1066-g7a4a --- diff --git a/config.txt b/config.txt index 6ae11842e..72a33e98b 100644 --- a/config.txt +++ b/config.txt @@ -507,7 +507,9 @@ gc.rerereunresolved:: 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. diff --git a/git-add.html b/git-add.html index 89dd4d7ab..bbab7e4cc 100644 --- a/git-add.html +++ b/git-add.html @@ -345,9 +345,17 @@ commit.

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
@@ -532,7 +540,9 @@ j - do not decide on this hunk now, and view the next J - do not decide on this hunk now, and view the next hunk 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 +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.

@@ -571,7 +581,7 @@ diff diff --git a/git-add.txt b/git-add.txt index 63829d93c..e74f83b47 100644 --- a/git-add.txt +++ b/git-add.txt @@ -61,7 +61,14 @@ OPTIONS -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 @@ -210,6 +217,8 @@ patch:: 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. diff --git a/git-config.html b/git-config.html index 65d40fdab..8abb0483e 100644 --- a/git-config.html +++ b/git-config.html @@ -1439,7 +1439,9 @@ rerere.enabled

Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they - be encountered again. See git-rerere(1). + be encountered again. git-rerere(1) command is by + default enabled, but can be disabled by setting this option to + false.

@@ -2024,7 +2026,7 @@ transfer.unpackLimit diff --git a/git-rerere.html b/git-rerere.html index 980855021..08efed8f8 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -284,15 +284,6 @@ to the "release" branch, or sent out and accepted upstream).

automerge results and corresponding hand-resolve results on the 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

@@ -481,7 +472,7 @@ conflict.

diff --git a/git-rerere.txt b/git-rerere.txt index c4d426323..8ce492c8f 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -22,10 +22,6 @@ automerge results and corresponding hand-resolve results on the 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 -------- diff --git a/git-send-pack.html b/git-send-pack.html index 62e233309..2cdff5a0e 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -394,7 +394,9 @@ single pattern <name> is just a shorthand for <name>:&l 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 git-rev-parse(1) to resolve a symbolic ref +name.

  • @@ -451,7 +453,7 @@ to disable the fast-forward check only on that ref.

    diff --git a/git-send-pack.txt b/git-send-pack.txt index 2fa01d4a3..a2d9cb61b 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -85,7 +85,9 @@ Each pattern pair consists of the source side (before the colon) 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 does not match exactly one of the local refs. diff --git a/git.html b/git.html index 94551ccdf..0a13e42d5 100644 --- a/git.html +++ b/git.html @@ -1919,7 +1919,7 @@ 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 Andreas Ericsson <ae@op5.se>.

  • @@ -1941,7 +1941,7 @@ contributors on the git-list <git@vger.kernel.org>.

    diff --git a/git.txt b/git.txt index c4e6fc649..1574ecd77 100644 --- a/git.txt +++ b/git.txt @@ -536,7 +536,7 @@ Authors ------- * git's founding father is Linus Torvalds . * The current git nurse is Junio C Hamano . -* The git potty was written by Andres Ericsson . +* The git potty was written by Andreas Ericsson . * General upbringing is handled by the git-list . Documentation