From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
To: Rogan Dawes <lists@dawes.za.net>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Robert Fitzsimons <robfitz@273k.net>
Subject: Re: Merge, rebase and whitespace fixes
Date: Tue, 30 Jun 2009 09:37:08 +0200 [thread overview]
Message-ID: <cb7bb73a0906300037w6b61cae0jeecd2f97b1095b17@mail.gmail.com> (raw)
In-Reply-To: <4A493287.20106@dawes.za.net>
On Mon, Jun 29, 2009 at 11:30 PM, Rogan Dawes<lists@dawes.za.net> wrote:
> Giuseppe Bilotta wrote:
>> Hello all,
>>
>> recently a tree I've been working on received some thorough whitespace
>> adjustments (changing indents from spaces to tabs). This results in
>> annoying conflicts when running merges or rebases with my local
>> branches. I tried googling around but I couldn't find any helpful
>> hints on how to make git cope with this. Any suggestions?
>>
>
> Do the same thing to your own tree?
I tried doing the whitespace cleanup on top of the last patch, but the
merge still conflicted.
The interesting thing is that there's patchset from Robert Fitzsimons
that goes back to August 2005 (!) that does a couple of git apply
cleanups and in particular adds the --ignore-whitespace option that I
would need ...
http://permalink.gmane.org/gmane.comp.version-control.git/7876
but the patch apparently never made it into mainline ...
--
Giuseppe "Oblomov" Bilotta
next prev parent reply other threads:[~2009-06-30 7:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-29 19:18 Merge, rebase and whitespace fixes Giuseppe Bilotta
2009-06-29 21:30 ` Rogan Dawes
2009-06-30 7:37 ` Giuseppe Bilotta [this message]
2009-06-30 9:03 ` Rogan Dawes
2009-06-30 9:18 ` Giuseppe Bilotta
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=cb7bb73a0906300037w6b61cae0jeecd2f97b1095b17@mail.gmail.com \
--to=giuseppe.bilotta@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lists@dawes.za.net \
--cc=robfitz@273k.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).