mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gb/apply-ignore-whitespace'

Browse Source 
* gb/apply-ignore-whitespace:
  git apply: option to ignore whitespace differences
This commit is contained in:
Junio C Hamano
2009-08-21 18:47:48 -07:00
parent bcd45e27d8 86c91f9179
commit 5e092b5bce
11 changed files with 389 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-am.sh
View File

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