mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/rerere'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2008-07-07 02:17:28 -07:00
parent 17d778e710 121c813f8d
commit 86d7244321
3 changed files with 95 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/config.txt
View File

@ -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