]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'gb/maint-am-stgit-author-to-from-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:11 +0000 (13:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:11 +0000 (13:18 -0700)
* gb/maint-am-stgit-author-to-from-fix:
  am: fix stgit patch mangling

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge