git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason Sewall" <jasonsewall@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Raimund Bauer" <ray007@gmx.net>, git@vger.kernel.org
Subject: Re: Strange diff behavior?
Date: Thu, 21 Jun 2007 09:46:02 -0700	[thread overview]
Message-ID: <31e9dd080706210946i4821f300o55e89b67b3be562@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0706211131160.4059@racer.site>

Ok, it was my bad. There *were* whitespaces on those lines, but in
HEAD^, not head. Git only cares when they are introduced, not when
they are removed. So git diff HEAD^..HEAD showed that strange line
removal/add but git diff HEAD..HEAD^ shows me the whitespace.

I recently set up emacs to strip whitespace whenever I save a file to
prevent git from complaining (and it's good practice anyway), so that
explains why I didn't expect the change

Sorry about the mixup, and thanks for your help.

On 6/21/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Thu, 21 Jun 2007, Raimund Bauer wrote:
>
> > On Thu, 2007-06-21 at 02:13 +0100, Johannes Schindelin wrote:
> >
> > > Just a guess: core.autocrlf=true?
> >
> > My guess: apply.whitespace=strip
>
> Much better guess, I guess. Jason?
>
> Ciao,
> Dscho
>

  reply	other threads:[~2007-06-21 16:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-21  1:02 Strange diff behavior? Jason Sewall
2007-06-21  1:13 ` Johannes Schindelin
2007-06-21  6:47   ` Raimund Bauer
2007-06-21 10:31     ` Johannes Schindelin
2007-06-21 16:46       ` Jason Sewall [this message]
2007-06-21  6:50 ` Matthias Lederhofer
2007-06-21  7:02   ` Jason Sewall

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=31e9dd080706210946i4821f300o55e89b67b3be562@mail.gmail.com \
    --to=jasonsewall@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=ray007@gmx.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).