diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:28 -0700 |
| commit | 86d72443215612f66f77dfc57ec9613c8153617c (patch) | |
| tree | 82923deca0de6a8ae263ba84e7f239e881db8388 /Documentation | |
| parent | 17d778e710f9dacc770b5790e792b85cdba75a9d (diff) | |
| parent | 121c813f8d6054dbee25c03301599c0f8d645d7f (diff) | |
| download | git-86d72443215612f66f77dfc57ec9613c8153617c.tar.gz | |
Merge branch 'jc/rerere'
* jc/rerere:
rerere.autoupdate
t4200: fix rerere test
rerere: remove dubious "tail_optimization"
git-rerere: detect unparsable conflicts
rerere: rerere_created_at() and has_resolution() abstraction
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 a403d46c1b..838794dca7 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 |