diff options
Diffstat (limited to 'rerere-options.txt')
| -rw-r--r-- | rerere-options.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/rerere-options.txt b/rerere-options.txt new file mode 100644 index 000000000..c3321ddea --- /dev/null +++ b/rerere-options.txt @@ -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`. |