diff options
Diffstat (limited to 'Documentation/rerere-options.adoc')
| -rw-r--r-- | Documentation/rerere-options.adoc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc new file mode 100644 index 0000000000..b0b920144a --- /dev/null +++ b/Documentation/rerere-options.adoc @@ -0,0 +1,9 @@ +`--rerere-autoupdate`:: +`--no-rerere-autoupdate`:: + After the rerere mechanism reuses a recorded resolution on + the current conflict to update the files in the working + tree, allow it to also update the index with the result of + resolution. `--no-rerere-autoupdate` is a good way to + double-check what `rerere` did and catch potential + mismerges, before committing the result to the index with a + separate `git add`. |