diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 10:28:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 10:28:07 (GMT) |
| commit | fffbf7c6ba3a3653b92329f879d238e6fea4dfce (patch) | |
| tree | 6c7dc704528bbb11c29ad2b2f5dad02de5354ef1 /Documentation/git-rebase.txt | |
| parent | 17c8f1f2eda10a972af01b6a909d6586e4114c41 (diff) | |
| parent | 15c6dbd877b0df7d52ec23fb9e0004c3baf841e9 (diff) | |
| download | git-fffbf7c6ba3a3653b92329f879d238e6fea4dfce.zip git-fffbf7c6ba3a3653b92329f879d238e6fea4dfce.tar.gz git-fffbf7c6ba3a3653b92329f879d238e6fea4dfce.tar.bz2 | |
Merge branch 'pw/rerere-autoupdate'
Doc updates.
* pw/rerere-autoupdate:
merge: tweak --rerere-autoupdate documentation
am/cherry-pick/rebase/revert: document --rerere-autoupdate
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 44e0032..f5e6ae3 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 |