Merge branch 'jc/rerere'
* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends
Junio C Hamano committed
Jan 18, 2010 at 18:13 UTC
4a88fb7ffc32bdfdfab2605430514d92aba25b8a
No changes.
* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends
No changes.