All of lore.kernel.org
 help / color / mirror / Atom feed
From: layer <layer@known.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: git merge ignoring whitespace
Date: Thu, 05 Feb 2009 15:24:49 -0800	[thread overview]
Message-ID: <2754.1233876289@relay.known.net> (raw)

Junio, on 3/25/07 you said:

  I know Linus does not like applying patches with whitespace
  fuzziness, but I personally think a merge that ignores
  whitespace changes would be a useful thing to have, without
  having to call an external specialized merge backend. In other
  words, I do not think it is so special a thing to want to, but
  it is rather an unfortunate norm.  I am not opposed to give
  git-merge-recursive a command line option to tell it to merge
  ignoring the whitespace-only changes, when it does the 3-way
  file-level merge internally.

Whatever came of this?  I tried giving git merge a --ignore-whitespace
argument and the error message that followed show no equivalent
argument.

It would sure come in handy right now.  Is there some other way to do
it that I didn't find searching the mailing list?

Thanks.

Kevin

             reply	other threads:[~2009-02-05 23:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-05 23:24 layer [this message]
2009-02-05 23:44 ` git merge ignoring whitespace Junio C Hamano
2009-02-05 23:48   ` layer
2009-02-13  1:38 ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2754.1233876289@relay.known.net \
    --to=layer@known.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.