Code

Merge branch 'ma/am-exclude'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2011 05:07:54 +0000 (22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2011 05:07:54 +0000 (22:07 -0700)
* ma/am-exclude:
  am: Document new --exclude=<path> option
  am: pass exclude down to apply

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge