summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:48 (GMT)
commit5e092b5bcea48c098af7000f888a2a0f16c9db77 (patch)
treea7f8635ab1ad5542201d8d46f39d4672d3bd87b9 /git-am.sh
parentbcd45e27d8790d8981d4c6734bc573363121efd3 (diff)
parent86c91f91794cd6af8e19fbe68ab283d567d2b66f (diff)
downloadgit-5e092b5bcea48c098af7000f888a2a0f16c9db77.zip
git-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.gz
git-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.bz2
Merge branch 'gb/apply-ignore-whitespace'
* gb/apply-ignore-whitespace: git apply: option to ignore whitespace differences
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 5396be2..3c03f3e 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -16,6 +16,8 @@ s,signoff add a Signed-off-by line to the commit message
u,utf8 recode into utf8 (default)
k,keep pass -k flag to git-mailinfo
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
C= pass it through git-apply
p= pass it through git-apply
@@ -327,7 +329,7 @@ do
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
--patch-format)
shift ; patch_format="$1" ;;
- --reject)
+ --reject|--ignore-whitespace|--ignore-space-change)
git_apply_opt="$git_apply_opt $1" ;;
--committer-date-is-author-date)
committer_date_is_author_date=t ;;