diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
| commit | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (patch) | |
| tree | 78de8e7c65f35106dfde60f0e6b4284f09e7f43f /git-rebase.txt | |
| parent | e0f71462e15863fa4b188b26e30db0155d52a946 (diff) | |
| download | git-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz | |
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 44e00329e..f5e6ae390 100644 --- a/git-rebase.txt +++ b/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 |