author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | |
Tue, 4 Aug 2009 11:16:49 +0000 (13:16 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Aug 2009 18:59:56 +0000 (11:59 -0700) | ||
commit | 86c91f91794cd6af8e19fbe68ab283d567d2b66f | |
tree | 2a8f3476997717ddf57d6dadd2c553461028d409 | tree | snapshot |
parent | 07a4a3b4962e1fd4e40fd877427cddd7428c1bc3 | commit | diff |
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>
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>
Documentation/config.txt | diff | blob | history | |
Documentation/git-am.txt | diff | blob | history | |
Documentation/git-apply.txt | diff | blob | history | |
Documentation/git-rebase.txt | diff | blob | history | |
builtin-apply.c | diff | blob | history | |
cache.h | diff | blob | history | |
contrib/completion/git-completion.bash | diff | blob | history | |
environment.c | diff | blob | history | |
git-am.sh | diff | blob | history | |
git-rebase.sh | diff | blob | history | |
t/t4107-apply-ignore-whitespace.sh | [new file with mode: 0755] | blob |