From: Junio C Hamano Date: Mon, 14 Aug 2017 22:22:52 +0000 (-0700) Subject: Merge branch 'pw/sequence-rerere-autoupdate' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/010cbb0cbe628b7f96db067758862c16bfc299e9 Merge branch 'pw/sequence-rerere-autoupdate' into next 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 --- 010cbb0cbe628b7f96db067758862c16bfc299e9