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 /Documentation/git-am.txt | |
| 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>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 5 |
1 files changed, 5 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>:: |