Jonathan Nieder fdc4408a89 merge script: learn --[no-]rerere-autoupdate ...

Port v1.7.0-rc0~83^2 (Teach --[no-]rerere-autoupdate option to
merge, revert and friends, 2009-12-04) to the example merge script.

After this change, all tests pass for me with the scripted
merge.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-08-18 14:02:05 -07:00

14 KiB

Executable File

Raw Blame History

View Raw