diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:13:40 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:05 -0700 |
| commit | fdc4408a8980392f2cc30dc125906a61edf170ec (patch) | |
| tree | 0ae3d9dd3f1e63887a2b5847e71cb3b4f7627a8a /builtin/merge.c | |
| parent | c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3 (diff) | |
| download | git-fdc4408a8980392f2cc30dc125906a61edf170ec.tar.gz git-fdc4408a8980392f2cc30dc125906a61edf170ec.tar.xz | |
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/merge.c')
0 files changed, 0 insertions, 0 deletions