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

git.99rst.org / git.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ea3860 7b3b7e3)

author	Junio C Hamano <redacted>
	Wed, 22 Dec 2010 22:41:19 +0000 (14:41 -0800)
committer	Junio C Hamano <redacted>
	Wed, 22 Dec 2010 22:41:19 +0000 (14:41 -0800)

* jc/maint-am-abort-safely:
am --abort: keep unrelated commits since the last failure and warn

		1	2
git-am.sh	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

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