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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 1082fb2 ee2d1cb)

author	Junio C Hamano <redacted>
	Sun, 29 Jan 2012 21:18:53 +0000 (13:18 -0800)
committer	Junio C Hamano <redacted>
	Sun, 29 Jan 2012 21:18:53 +0000 (13:18 -0800)
commit	bff64a9cdabee8476ad1d2e45f586a2d6a884363
tree	8e40ea0492651a36c7b615e19c04b500c152bf29	tree \| snapshot
parent	1082fb22b236201ea71fcf5e262d48796992fe72	commit \| diff
parent	ee2d1cb402a7ccda0028b221f2252801b3cb7eef	commit \| diff

Merge branch 'tr/maint-mailinfo'

* tr/maint-mailinfo:
mailinfo: with -b, keep space after [foo]
am: learn passing -b to mailinfo

Conflicts:
git-am.sh

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

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