From: Giuseppe Bilotta Date: Mon, 29 Jun 2009 19:18:36 GMT Subject: Merge, rebase and whitespace fixes Message-ID: 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? -- Giuseppe "Oblomov" Bilotta