Merge branch 'jc/rerere'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 02:13:01 +0000 (18:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 02:13:01 +0000 (18:13 -0800)
commit4a88fb7ffc32bdfdfab2605430514d92aba25b8a
tree77d37de207313b760eb08c502be1ea98a18351e9
parent26b9f5cc99a35d4f678c2f565e48237fc9515444
parentcb6020bb017405cc3e7f1faea6f30d4fd1b62e70
Merge branch 'jc/rerere'

* jc/rerere:
  Teach --[no-]rerere-autoupdate option to merge, revert and friends
builtin-commit.c
builtin-merge.c
builtin-rerere.c
git-rebase.sh