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

author	Junio C Hamano <redacted>
	Mon, 16 Dec 2019 21:08:32 +0000 (13:08 -0800)
committer	Junio C Hamano <redacted>
	Mon, 16 Dec 2019 21:08:32 +0000 (13:08 -0800)
commit	71a7de7a99a3199a9ea0660287bd4c1747f4d3b6
tree	1b8efa2809270ee2131954f26f3d6850ed19868d	tree \| snapshot
parent	c9f5fc91142c26c4a0f69f8eaed35c55e9c591f5	commit \| diff
parent	cae0bc09abcb12aff79f1aea85d578df7856de4a	commit \| diff

Merge branch 'dl/rebase-with-autobase'

"git rebase" did not work well when format.useAutoBase
configuration variable is set, which has been corrected.

* dl/rebase-with-autobase:
  rebase: fix format.useAutoBase breakage
  format-patch: teach --no-base
  t4014: use test_config()
  format-patch: fix indentation
  t3400: demonstrate failure with format.useAutoBase

builtin/log.c	diff1 \|	diff2 \|	blob \| history
builtin/rebase.c	diff1 \|	diff2 \|	blob \| history
t/t3400-rebase.sh	diff1 \|	diff2 \|	blob \| history

RSS Atom

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

builtin/log.c	diff1 \|	diff2 \|	blob \| history
builtin/rebase.c	diff1 \|	diff2 \|	blob \| history
t/t3400-rebase.sh	diff1 \|	diff2 \|	blob \| history