diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-22 01:47:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-22 01:47:48 (GMT) |
| commit | 5e092b5bcea48c098af7000f888a2a0f16c9db77 (patch) | |
| tree | a7f8635ab1ad5542201d8d46f39d4672d3bd87b9 /contrib | |
| parent | bcd45e27d8790d8981d4c6734bc573363121efd3 (diff) | |
| parent | 86c91f91794cd6af8e19fbe68ab283d567d2b66f (diff) | |
| download | git-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 '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 5543dc4..bf688e1 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 @@ -1537,6 +1539,7 @@ _git_config () __gitcomp " add.ignore-errors alias. + apply.ignorewhitespace apply.whitespace branch.autosetupmerge branch.autosetuprebase |