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

Re: Merge, rebase and whitespace fixes

From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date
Jun 30, 2009, 07:37 UTC
Message-ID
<cb7bb73a0906300037w6b61cae0jeecd2f97b1095b17@mail.gmail.com>
In-Reply-To
<4A493287.20106@dawes.za.net>
On Mon, Jun 29, 2009 at 11:30 PM, Rogan Dawes<lists@dawes.za.net> wrote:
Show 11 quoted lines
> 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
Previous: Rogan DawesNext: Rogan Dawes
Message 3 of 5 in “Merge, rebase and whitespace fixes”
  1. Giuseppe BilottaJun 29, 2009
  2. Rogan DawesJun 29, 2009
  3. Giuseppe BilottaJun 30, 2009
  4. Rogan DawesJun 30, 2009
  5. Giuseppe BilottaJun 30, 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.