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

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c580ce1 de3ce21)

author	Junio C Hamano <redacted>
	Sun, 10 Sep 2017 08:03:02 +0000 (17:03 +0900)
committer	Junio C Hamano <redacted>
	Sun, 10 Sep 2017 08:03:02 +0000 (17:03 +0900)
commit	afa6608b930b722dbf93dfc44f4cc225862d33ed
tree	311805d7eba49ea7f480134aee0d1b78b9fbe524	tree \| snapshot
parent	c580ce194fc1a62b676190a3300fde4c6ba58380	commit \| diff
parent	de3ce210edb4870b082fab18148f859d2b3c9ae2	commit \| diff

Merge branch 'rs/merge-microcleanup' into maint

Code clean-up.

* rs/merge-microcleanup:
merge: use skip_prefix()

builtin/merge.c

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