Merge branch 'jb/am-include'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:49:15 +0000 (15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:49:16 +0000 (15:49 -0700)
"git am" learned the "--include" option, which is an opposite of existing
the "--exclude" option.

By Johannes Berg
* jb/am-include:
  am: support --include option

1  2 
Documentation/git-am.txt
git-am.sh

Simple merge
diff --cc git-am.sh
Simple merge