diff options
Diffstat (limited to 'Documentation/config/rerere.txt')
| -rw-r--r-- | Documentation/config/rerere.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt new file mode 100644 index 000000000000..40abdf6a6b5d --- /dev/null +++ b/Documentation/config/rerere.txt @@ -0,0 +1,12 @@ +rerere.autoUpdate:: + When set to true, `git-rerere` updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. + +rerere.enabled:: + Activate recording of resolved conflicts, so that identical + conflict hunks can be resolved automatically, should they be + encountered again. By default, linkgit:git-rerere[1] is + enabled if there is an `rr-cache` directory under the + `$GIT_DIR`, e.g. if "rerere" was previously used in the + repository. |