A small patchset that allows git-apply (and thus git-am and git-rebase) to cope with whitespace differences that would otherwise generate a conflict. The first patch is basically an update of Rober Fitzsimons' previous work http://permalink.gmane.org/gmane.comp.version-control.git/7876 whereas the second one is entirely mine and makes the context lines match the original instead of the patched whitespace. Giuseppe Bilotta (2): git apply: option to ignore whitespace differences git apply: preserve original whitespace with --ignore-whitespace builtin-apply.c | 83 ++++++++++++++++++++++++++++++-- contrib/completion/git-completion.bash | 2 + git-am.sh | 3 +- git-rebase.sh | 3 + t/t4107-apply-ignore-whitespace.sh | 74 ++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+), 6 deletions(-) create mode 100755 t/t4107-apply-ignore-whitespace.sh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html