From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Jul 2008 09:17:28 +0000 (-0700)
Subject: Merge branch 'jc/rerere'
X-Git-Tag: v1.6.0-rc0~120
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86d72443215612f66f77dfc57ec9613c8153617c;p=git.git

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

86d72443215612f66f77dfc57ec9613c8153617c
diff --cc Documentation/config.txt
index a403d46c1,0c7cf618e..838794dca
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -655,9 -647,14 +655,14 @@@ gc.rerereresolved:
  
  gc.rerereunresolved::
  	Records of conflicted merge you have not resolved are
 -	kept for this many days when `git rerere gc` is run.
 +	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