Merge branch 'gb/apply-ignore-whitespace'

* gb/apply-ignore-whitespace:
git apply: option to ignore whitespace differences

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin-apply.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc git-am.sh
Simple merge

diff --cc git-rebase.sh
Simple merge