diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2009-08-04 11:16:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 18:59:56 (GMT) |
| commit | 86c91f91794cd6af8e19fbe68ab283d567d2b66f (patch) | |
| tree | 2a8f3476997717ddf57d6dadd2c553461028d409 /contrib | |
| parent | 07a4a3b4962e1fd4e40fd877427cddd7428c1bc3 (diff) | |
| download | git-86c91f91794cd6af8e19fbe68ab283d567d2b66f.zip git-86c91f91794cd6af8e19fbe68ab283d567d2b66f.tar.gz git-86c91f91794cd6af8e19fbe68ab283d567d2b66f.tar.bz2 | |
git apply: option to ignore whitespace differences
Introduce --ignore-whitespace option and corresponding config bool to
ignore whitespace differences while applying patches, akin to the
'patch' program.
'git am', 'git rebase' and the bash git completion are made aware of
this option.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 745b5fb..dd7ec5d 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -674,6 +674,7 @@ _git_am () --*) __gitcomp " --3way --committer-date-is-author-date --ignore-date + --ignore-whitespace --ignore-space-change --interactive --keep --no-utf8 --signoff --utf8 --whitespace= " @@ -695,6 +696,7 @@ _git_apply () --stat --numstat --summary --check --index --cached --index-info --reverse --reject --unidiff-zero --apply --no-add --exclude= + --ignore-whitespace --ignore-space-change --whitespace= --inaccurate-eof --verbose " return @@ -1536,6 +1538,7 @@ _git_config () __gitcomp " add.ignore-errors alias. + apply.ignorewhitespace apply.whitespace branch.autosetupmerge branch.autosetuprebase |