author | Junio C Hamano <gitster@pobox.com> | |
Sat, 22 Aug 2009 01:47:48 +0000 (18:47 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 22 Aug 2009 01:47:48 +0000 (18:47 -0700) | ||
commit | 5e092b5bcea48c098af7000f888a2a0f16c9db77 | |
tree | a7f8635ab1ad5542201d8d46f39d4672d3bd87b9 | tree | snapshot |
parent | bcd45e27d8790d8981d4c6734bc573363121efd3 | commit | diff |
parent | 86c91f91794cd6af8e19fbe68ab283d567d2b66f | commit | diff |
Merge branch 'gb/apply-ignore-whitespace'
* gb/apply-ignore-whitespace:
git apply: option to ignore whitespace differences
* gb/apply-ignore-whitespace:
git apply: option to ignore whitespace differences
Documentation/config.txt | diff1 | | diff2 | | blob | history |
builtin-apply.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |
git-am.sh | diff1 | | diff2 | | blob | history |
git-rebase.sh | diff1 | | diff2 | | blob | history |