Merge branch 'gb/apply-ignore-whitespace'
authorJunio C Hamano <gitster@pobox.com>
Sat, 22 Aug 2009 01:47:48 +0000 (18:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 22 Aug 2009 01:47:48 +0000 (18:47 -0700)
commit5e092b5bcea48c098af7000f888a2a0f16c9db77
treea7f8635ab1ad5542201d8d46f39d4672d3bd87b9
parentbcd45e27d8790d8981d4c6734bc573363121efd3
parent86c91f91794cd6af8e19fbe68ab283d567d2b66f
Merge branch 'gb/apply-ignore-whitespace'

* gb/apply-ignore-whitespace:
  git apply: option to ignore whitespace differences
Documentation/config.txt
builtin-apply.c
cache.h
contrib/completion/git-completion.bash
git-am.sh
git-rebase.sh