am: support --include option
am supports a number of pass-through options to apply, like --exclude and --directory. Add --include to this list. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Berg committed
Mar 28, 2012 at 13:11 UTC
58725efd4a0583e4a3793b054ebaf57bd40e82fa
2 files changed
+4
-2
Documentation/git-am.txt
+2
-1
@@ -13,7 +13,7 @@ SYNOPSIS
13
[--3way] [--interactive] [--committer-date-is-author-date]
14
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
15
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
16
- [--exclude=<path>] [--reject] [-q | --quiet]
16
+ [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
17
[--scissors | --no-scissors]
18
[(<mbox> | <Maildir>)...]
19
'git am' (--continue | --skip | --abort)
@@ -89,6 +89,7 @@ default. You can use `--no-utf8` to override this.
89
-p<n>::
90
--directory=<dir>::
91
--exclude=<path>::
92
+--include=<path>::
93
--reject::
94
These flags are passed to the 'git apply' (see linkgit:git-apply[1])
95
program that applies
git-am.sh
+2
-1
@@ -23,6 +23,7 @@ ignore-space-change pass it through git-apply
23
ignore-whitespace pass it through git-apply
24
directory= pass it through git-apply
25
exclude= pass it through git-apply
26
+include= pass it through git-apply
27
C= pass it through git-apply
28
p= pass it through git-apply
29
patch-format= format the patch(es) are in
@@ -363,7 +364,7 @@ do
364
;;
365
--resolvemsg)
366
shift; resolvemsg=$1 ;;
366
- --whitespace|--directory|--exclude)
367
+ --whitespace|--directory|--exclude|--include)
368
git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
369
-C|-p)
370
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;