projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c2c9a87) | patch
merge script: learn --[no-]rerere-autoupdate
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:13:40 +0000 (02:13 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:05 +0000 (14:02 -0700)
commitfdc4408a8980392f2cc30dc125906a61edf170ec
tree0ae3d9dd3f1e63887a2b5847e71cb3b4f7627a8atree | snapshot
parentc2c9a87d4f5a643ef93db7c39fc01c4965bf67a3commit | diff
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>
contrib/examples/git-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.