diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-18 22:07:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 22:07:54 -0700 |
| commit | d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df (patch) | |
| tree | 25598aff5456212a2ea45cff89c72fd49dc5a848 /git-am.sh | |
| parent | 7c10882c0d299b5d1dbe2c633e95c91ca6152197 (diff) | |
| parent | 2ae7345ab290ea1357c0b2f1901ef531c9f59e5b (diff) | |
| download | git-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.gz git-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.xz | |
Merge branch 'ma/am-exclude'
* ma/am-exclude:
am: Document new --exclude=<path> option
am: pass exclude down to apply
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -22,6 +22,7 @@ whitespace= pass it through git-apply 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 C= pass it through git-apply p= pass it through git-apply patch-format= format the patch(es) are in @@ -366,7 +367,7 @@ do ;; --resolvemsg) shift; resolvemsg=$1 ;; - --whitespace|--directory) + --whitespace|--directory|--exclude) git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;; -C|-p) git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;; |