Gmane
Picon Gravatar
From: Giuseppe Bilotta <giuseppe.bilotta <at> gmail.com>
Subject: [PATCHv1bis 0/2] git apply: cope with whitespace differences
Newsgroups: gmane.comp.version-control.git
Date: 2009-07-02 17:48:39 GMT (35 weeks, 6 days, 6 hours and 37 minutes ago)
Sometimes I do some very stupid things, as was the case with the first
version of this sequence. This new version still doesn't include Junio's
suggestion to move whitespace fixing to before the check, because I'm
not convinced it should be the case.

Giuseppe Bilotta (2):
  git apply: option to ignore whitespace differences
  git apply: preserve original whitespace with --ignore-whitespace

 builtin-apply.c                        |   90 +++++++++++++++++++++++++++++--
 contrib/completion/git-completion.bash |    2 +
 git-am.sh                              |    3 +-
 git-rebase.sh                          |    3 +
 t/t4107-apply-ignore-whitespace.sh     |   74 ++++++++++++++++++++++++++
 5 files changed, 165 insertions(+), 7 deletions(-)
 create mode 100755 t/t4107-apply-ignore-whitespace.sh