From: Junio C Hamano Date: Sun, 10 Sep 2017 08:02:49 +0000 (+0900) Subject: Merge branch 'pw/sequence-rerere-autoupdate' into maint X-Git-Tag: v2.14.2~38 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86c726f0d1ac91a6dacb3ae306d830e9686ae703;p=git Merge branch 'pw/sequence-rerere-autoupdate' into maint Commands like "git rebase" accepted the --rerere-autoupdate option from the command line, but did not always use it. This has been fixed. * pw/sequence-rerere-autoupdate: cherry-pick/revert: reject --rerere-autoupdate when continuing cherry-pick/revert: remember --rerere-autoupdate t3504: use test_commit rebase -i: honor --rerere-autoupdate rebase: honor --rerere-autoupdate am: remember --rerere-autoupdate setting --- 86c726f0d1ac91a6dacb3ae306d830e9686ae703