diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:16 -0700 |
| commit | 334dde8532c68dfcadefbc3a7d96a499c0ec1445 (patch) | |
| tree | 2b8b51693d416a9cc0760840bba65431d3e02c53 /git-am.sh | |
| parent | 503c15ac0921338ef7e9e0ff4a6c9fcc18b2d8d5 (diff) | |
| parent | 58725efd4a0583e4a3793b054ebaf57bd40e82fa (diff) | |
| download | git-334dde8532c68dfcadefbc3a7d96a499c0ec1445.tar.gz | |
Merge branch 'jb/am-include'
"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
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -24,6 +24,7 @@ ignore-space-change pass it through git-apply ignore-whitespace pass it through git-apply directory= pass it through git-apply exclude= pass it through git-apply +include= pass it through git-apply C= pass it through git-apply p= pass it through git-apply patch-format= format the patch(es) are in @@ -412,7 +413,7 @@ do ;; --resolvemsg) shift; resolvemsg=$1 ;; - --whitespace|--directory|--exclude) + --whitespace|--directory|--exclude|--include) git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;; -C|-p) git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;; |