git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv1bis 0/2] git apply: cope with whitespace differences

From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date
Jul 2, 2009, 17:48 UTC
Message-ID
<1246556921-5819-1-git-send-email-giuseppe.bilotta@gmail.com>

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
Next: Giuseppe Bilotta
Message 1 of 12 in “[PATCHv1bis 0/2] git apply: cope with whitespace differences”
  1. Giuseppe BilottaJul 2, 2009
  2. 1/2 git apply: option to ignore whitespace differencesGiuseppe Bilotta, Jul 2, 2009
  3. 2/2 git apply: preserve original whitespace with --ignore-whitespaceGiuseppe Bilotta, Jul 2, 2009
  4. Junio C HamanoJul 2, 2009
  5. Giuseppe BilottaJul 2, 2009
  6. Giuseppe BilottaJul 2, 2009
  7. Junio C HamanoJul 2, 2009
  8. Giuseppe BilottaJul 2, 2009
  9. Junio C HamanoJul 2, 2009
  10. Giuseppe BilottaJul 2, 2009
  11. Junio C HamanoJul 2, 2009
  12. Giuseppe BilottaJul 3, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.