blob: c3321ddea248739f1a0413b134ac401fd0b71794 (
plain)
1
2
3
4
5
6
7
8
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`.
|
