| 1 | `--rerere-autoupdate`:: |
| 2 | `--no-rerere-autoupdate`:: |
| 3 | After the rerere mechanism reuses a recorded resolution on |
| 4 | the current conflict to update the files in the working |
| 5 | tree, allow it to also update the index with the result of |
| 6 | resolution. `--no-rerere-autoupdate` is a good way to |
| 7 | double-check what linkgit:git-rerere[1] did and catch potential |
| 8 | mismerges, before committing the result to the index with a |
| 9 | separate linkgit:git-add[1]. |