Merge branch 'tr/maint-mailinfo'
commitbff64a9cdabee8476ad1d2e45f586a2d6a884363
authorJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:53 +0000 (29 13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 29 Jan 2012 21:18:53 +0000 (29 13:18 -0800)
tree8e40ea0492651a36c7b615e19c04b500c152bf29
parent1082fb22b236201ea71fcf5e262d48796992fe72
parentee2d1cb402a7ccda0028b221f2252801b3cb7eef
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
git-am.sh
t/t4150-am.sh