mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-09 23:33:34 -05:00
6bfef81c9a
Five commands include these options. Let’s link to the command so that the curious user can learn more about what “rerere” is about. It’s also better to consistently refer to things like e.g. “git-subcommand(1)” over `git subcommand` or `subcommand`. Also apply the same treatment to git-add(1). Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
10 lines
440 B
Plaintext
10 lines
440 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 linkgit:git-rerere[1] did and catch potential
|
|
mismerges, before committing the result to the index with a
|
|
separate linkgit:git-add[1].
|