diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-03-14 19:12:32 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-18 10:24:56 +0900 |
| commit | aba4954cb05fa60bc00ada3bdfcbe6d72d9b8380 (patch) | |
| tree | e3a6495c9fc4df2ee6775e09b175082d288b629e | |
| parent | e902e9bcae2010bc42648c80ab6adc6c5a16a4a5 (diff) | |
| download | git-aba4954cb05fa60bc00ada3bdfcbe6d72d9b8380.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-am.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-revert.txt | 5 |
4 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 6f6c34b0f4..fc3b993c33 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -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>:: diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index b8cfeec67e..d64e72462f 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -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[] diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6363d674b7..ed62b0c2de 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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 diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index 837707a8fd..6afccb2f1e 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -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[] |