Browse Source

am/cherry-pick/rebase/revert: document --rerere-autoupdate

This option was missing from the man pages of these commands.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Phillip Wood 6 years ago committed by Junio C Hamano
parent
commit
aba4954cb0
  1. 5
      Documentation/git-am.txt
  2. 5
      Documentation/git-cherry-pick.txt
  3. 5
      Documentation/git-rebase.txt
  4. 5
      Documentation/git-revert.txt

5
Documentation/git-am.txt

@ -99,6 +99,11 @@ default. You can use `--no-utf8` to override this. @@ -99,6 +99,11 @@ default. You can use `--no-utf8` to override this.
am.threeWay configuration variable. For more information,
see am.threeWay in linkgit:git-config[1].

--rerere-autoupdate::
--no-rerere-autoupdate::
Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible.

--ignore-space-change::
--ignore-whitespace::
--whitespace=<option>::

5
Documentation/git-cherry-pick.txt

@ -148,6 +148,11 @@ effect to your index in a row. @@ -148,6 +148,11 @@ effect to your index in a row.
Pass the merge strategy-specific option through to the
merge strategy. See linkgit:git-merge[1] for details.

--rerere-autoupdate::
--no-rerere-autoupdate::
Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible.

SEQUENCER SUBCOMMANDS
---------------------
include::sequencer.txt[]

5
Documentation/git-rebase.txt

@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below. @@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.
+
See also INCOMPATIBLE OPTIONS below.

--rerere-autoupdate::
--no-rerere-autoupdate::
Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible.

-S[<keyid>]::
--gpg-sign[=<keyid>]::
GPG-sign commits. The `keyid` argument is optional and

5
Documentation/git-revert.txt

@ -101,6 +101,11 @@ effect to your index in a row. @@ -101,6 +101,11 @@ effect to your index in a row.
Pass the merge strategy-specific option through to the
merge strategy. See linkgit:git-merge[1] for details.

--rerere-autoupdate::
--no-rerere-autoupdate::
Allow the rerere mechanism to update the index with the
result of auto-conflict resolution if possible.

SEQUENCER SUBCOMMANDS
---------------------
include::sequencer.txt[]

Loading…
Cancel
Save