![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Jul 2008 09:17:28 +0000 (02:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Jul 2008 09:17:28 +0000 (02:17 -0700) | ||
| commit | 86d72443215612f66f77dfc57ec9613c8153617c | |
| tree | 82923deca0de6a8ae263ba84e7f239e881db8388 | tree | snapshot |
| parent | 17d778e710f9dacc770b5790e792b85cdba75a9d | commit | diff |
| parent | 121c813f8d6054dbee25c03301599c0f8d645d7f | commit | 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
* 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 |