git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Jul 2012 20:04:39 +0000 (13:04 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Jul 2012 20:04:39 +0000 (13:04 -0700)
commit	9b67f560f473ec84c9ea77a1fa6378bc7cc29d9d
tree	a3f73f65ef4a6da836d1a265d4b5226d0737839c	tree \| snapshot
parent	8ba105dda861d33f3d7c3b9989592c1605027116	commit \| diff
parent	14bf2d58bc3b202da3ca34cfdf72392889135411	commit \| diff

Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint

When "git am" failed, old timers knew to check .git/rebase-apply/patch
to see what went wrong, but we never told the users about it.

* pg/maint-1.7.9-am-where-is-patch:
am: indicate where a failed patch is to be found

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
git-am.sh	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

RSS Atom

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
git-am.sh	diff1 \|	diff2 \|	blob \| history