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

author	Junio C Hamano <redacted>
	Fri, 10 Jan 2014 18:33:32 +0000 (10:33 -0800)
committer	Junio C Hamano <redacted>
	Fri, 10 Jan 2014 18:33:33 +0000 (10:33 -0800)
commit	d5d1678b9c675a97b3ec3aaf843d02b1cf536c74
tree	a7eb19b48f19a2aea413545e09729813bbb5fc57	tree \| snapshot
parent	55869681f1f0dc3fe9df0dd95f554f94dd519b72	commit \| diff
parent	8f29299136c2f11730d876cd62637a9e37d4c388	commit \| diff

Merge branch 'bm/merge-base-octopus-dedup'

"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

* bm/merge-base-octopus-dedup:
merge-base --octopus: reduce the result from get_octopus_merge_bases()
merge-base: separate "--independent" codepath into its own helper

builtin/merge-base.c	diff1 \|	diff2 \|	blob \| history
t/t6010-merge-base.sh	diff1 \|	diff2 \|	blob \| history

RSS Atom

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

builtin/merge-base.c	diff1 \|	diff2 \|	blob \| history
t/t6010-merge-base.sh	diff1 \|	diff2 \|	blob \| history