From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 17:29:00 +0000 (-0700)
Subject: Merge branch 'pw/sequence-rerere-autoupdate'
X-Git-Tag: v2.15.0-rc0~180
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1016495a7190911b37c354f7a985278c51ae6666;p=git-core%2Fgit.git

Merge branch 'pw/sequence-rerere-autoupdate'

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
---

1016495a7190911b37c354f7a985278c51ae6666