diff options
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-rerere.txt | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 6ae11842e..72a33e98b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -507,7 +507,9 @@ gc.rerereunresolved:: rerere.enabled:: Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they - be encountered again. See gitlink:git-rerere[1]. + be encountered again. gitlink:git-rerere[1] command is by + default enabled, but can be disabled by setting this option to + false. gitcvs.enabled:: Whether the CVS server interface is enabled for this repository. diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index c4d426323..8ce492c8f 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -22,10 +22,6 @@ automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same automerge results and applying the previously recorded hand resolution. -[NOTE] -You need to set the config variable rerere.enabled to enable this -command. - COMMANDS -------- |