diff options
Diffstat (limited to 'git-revert.txt')
| -rw-r--r-- | git-revert.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/git-revert.txt b/git-revert.txt index 8463fe9cf..0105a54c1 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -112,10 +112,7 @@ 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. +include::rerere-options.txt[] --reference:: Instead of starting the body of the log message with "This |