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)
* jc/rerere:
  Teach --[no-]rerere-autoupdate option to merge, revert and friends

1  2 
builtin-commit.c
builtin-merge.c
builtin-rerere.c
git-rebase.sh

Simple merge
diff --cc builtin-merge.c
Simple merge
Simple merge
diff --cc git-rebase.sh
Simple merge