Merge branch 'ma/am-exclude' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 22:06:49 +0000 (15:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 22:06:49 +0000 (15:06 -0700)
commit658e57c99f477a5a2ffd4cc77a65c55c57b70536
tree33b199ad9fcadf59952d5642efed3d128cbfa88b
parent2764424d60619f7ab53ba5fbdbf1a9cb4fffc2ea
parent77e9e496a1248085d3bdf50dc23b79b4e7f0d26d
Merge branch 'ma/am-exclude' into next

* ma/am-exclude:
  am: pass exclude down to apply
git-am.sh