]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-am.txt
git apply: option to ignore whitespace differences
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Tue, 4 Aug 2009 11:16:49 +0000 (13:16 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 18:59:56 +0000 (11:59 -0700)
commit86c91f91794cd6af8e19fbe68ab283d567d2b66f
tree2a8f3476997717ddf57d6dadd2c553461028d409
parent07a4a3b4962e1fd4e40fd877427cddd7428c1bc3
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>
Documentation/config.txt
Documentation/git-am.txt
Documentation/git-apply.txt
Documentation/git-rebase.txt
builtin-apply.c
cache.h
contrib/completion/git-completion.bash
environment.c
git-am.sh
git-rebase.sh
t/t4107-apply-ignore-whitespace.sh [new file with mode: 0755]