projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 421dc09 f826fb7)
Merge branch 'pw/sequence-rerere-autoupdate' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Aug 2017 22:22:52 +0000 (15:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Aug 2017 22:22:52 +0000 (15:22 -0700)
commit010cbb0cbe628b7f96db067758862c16bfc299e9
treef21f3210d7a4066e67ff13712a8996869ac4b71dtree | snapshot
parent421dc09fd0ca036b3f9ac1bf1b6743ae71f0a93ccommit | diff
parentf826fb799ed06f2f9537466f6988bcabd1200ebdcommit | diff
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
builtin/am.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.