mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
5f3213232f
- Use _<placeholder>_ instead of <placeholder> in the description - Use `backticks` for keywords and more complex option descriptions. The new rendering engine will apply synopsis rules to these spans. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 lines
418 B
Plaintext
10 lines
418 B
Plaintext
`--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`.
|