projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 17d778e 121c813)
Merge branch 'jc/rerere'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Jul 2008 09:17:28 +0000 (02:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jul 2008 09:17:28 +0000 (02:17 -0700)
commit86d72443215612f66f77dfc57ec9613c8153617c
tree82923deca0de6a8ae263ba84e7f239e881db8388tree | snapshot
parent17d778e710f9dacc770b5790e792b85cdba75a9dcommit | diff
parent121c813f8d6054dbee25c03301599c0f8d645d7fcommit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
Git—the stupid content tracker