Subject: [PATCHv2 0/2] git apply: cope with whitespace differences
Newsgroups: gmane.comp.version-control.git
Date: 2009-07-04 11:53:47 GMT (35 weeks, 4 days, 12 hours and 32 minutes ago)
This second version includes significant cleanups and improvements to my previous attempt at a --ignore-whitespace option for git-apply. Following Junio's review, the patch now includes proper handling for leading whitespace (specifically the case when one part has it and the other one doesn't), and more test cases. The second patch fixes the updating of the postimage when whitespace is adjusted to match the target. Giuseppe Bilotta (2): git apply: option to ignore whitespace differences git apply: preserve original whitespace with --ignore-whitespace builtin-apply.c | 108 +++++++++++++++++++++++++++++--- contrib/completion/git-completion.bash | 2 + git-am.sh | 3 +- git-rebase.sh | 3 + t/t4107-apply-ignore-whitespace.sh | 107 +++++++++++++++++++++++++++++++ 5 files changed, 214 insertions(+), 9 deletions(-) create mode 100755 t/t4107-apply-ignore-whitespace.sh