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-revert.txt | |
| parent | e0f71462e15863fa4b188b26e30db0155d52a946 (diff) | |
| download | git-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz | |
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'git-revert.txt')
| -rw-r--r-- | git-revert.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-revert.txt b/git-revert.txt index 837707a8f..6afccb2f1 100644 --- a/git-revert.txt +++ b/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[] |