git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 22 Aug 2017 17:29:00 +0000 (10:29 -0700)
committer	Junio C Hamano <redacted>
	Tue, 22 Aug 2017 17:29:00 +0000 (10:29 -0700)
commit	1016495a7190911b37c354f7a985278c51ae6666
tree	63d8897867229a377473b122902337658948add2	tree \| snapshot
parent	a49794d10826ef7cc9237abcf6474cd826de1063	commit \| diff
parent	f826fb799ed06f2f9537466f6988bcabd1200ebd	commit \| diff

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

builtin/am.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

builtin/am.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history