summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-17 07:13:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-18 21:02:05 (GMT)
commitfdc4408a8980392f2cc30dc125906a61edf170ec (patch)
tree0ae3d9dd3f1e63887a2b5847e71cb3b4f7627a8a /builtin.h
parentc2c9a87d4f5a643ef93db7c39fc01c4965bf67a3 (diff)
downloadgit-fdc4408a8980392f2cc30dc125906a61edf170ec.zip
git-fdc4408a8980392f2cc30dc125906a61edf170ec.tar.gz
git-fdc4408a8980392f2cc30dc125906a61edf170ec.tar.bz2
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>
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions