diff options
Diffstat (limited to 'third_party/git/Documentation/config/rerere.txt')
| -rw-r--r-- | third_party/git/Documentation/config/rerere.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/third_party/git/Documentation/config/rerere.txt b/third_party/git/Documentation/config/rerere.txt deleted file mode 100644 index 40abdf6a6b..0000000000 --- a/third_party/git/Documentation/config/rerere.txt +++ /dev/null @@ -1,12 +0,0 @@ -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. |