![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 02:13:01 +0000 (18:13 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 02:13:01 +0000 (18:13 -0800) | ||
| commit | 4a88fb7ffc32bdfdfab2605430514d92aba25b8a | |
| tree | 77d37de207313b760eb08c502be1ea98a18351e9 | tree | snapshot |
| parent | 26b9f5cc99a35d4f678c2f565e48237fc9515444 | commit | diff |
| parent | cb6020bb017405cc3e7f1faea6f30d4fd1b62e70 | commit | diff |
Merge branch 'jc/rerere'
* jc/rerere:
Teach --[no-]rerere-autoupdate option to merge, revert and friends
* jc/rerere:
Teach --[no-]rerere-autoupdate option to merge, revert and friends
| builtin-commit.c | diff1 | | diff2 | | blob | history |
| builtin-merge.c | diff1 | | diff2 | | blob | history |
| builtin-rerere.c | diff1 | | diff2 | | blob | history |
| git-rebase.sh | diff1 | | diff2 | | blob | history |