diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-22 02:04:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-22 02:06:58 -0700 |
| commit | 121c813f8d6054dbee25c03301599c0f8d645d7f (patch) | |
| tree | 36247d4df76782c03eef692bb8843502994bad52 /Documentation | |
| parent | 7f8365f894d60f240edd356f32e3c1bda994ed41 (diff) | |
| download | git-121c813f8d6054dbee25c03301599c0f8d645d7f.tar.gz | |
rerere.autoupdate
When this configuration is set, paths that are autoresolved by git-rerere
are updated in the index as well.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5331b450ea..0c7cf618ed 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -650,6 +650,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 |