diff options
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index a403d46c1b..e7848055a9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -658,6 +658,11 @@ gc.rerereunresolved:: kept for this many days when 'git-rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. +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 @@ -680,7 +685,7 @@ gitcvs.usecrlfattr treat it as text. If `crlf` is explicitly unset, the file will be set with '-kb' mode, which supresses any newline munging the client might otherwise do. If `crlf` is not specified, - then 'gitcvs.allbinary' is used. See linkgit:gitattribute[5]. + then 'gitcvs.allbinary' is used. See linkgit:gitattributes[5]. gitcvs.allbinary:: This is used if 'gitcvs.usecrlfattr' does not resolve |