global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ma/am-exclude' into next

Browse Source 
* ma/am-exclude:
  am: pass exclude down to apply
This commit is contained in:
Junio C Hamano
2011-08-05 15:06:49 -07:00
parent 2764424d60 77e9e496a1
commit 658e57c99f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-am.sh
View File

@@ -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 ;;