|
| From: | Steinar Bang |
| Subject: | Re: A simple git workflow for the rest of us |
| Date: | Sat, 22 Nov 2014 10:29:16 +0100 |
| User-agent: | Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (windows-nt) |
>>>>> Bill Wohler <address@hidden>: > I'd second setting it globally to ensure that it happens universally > to avoid the spurious merge commits that otherwise ensue. (I've never understood why "spurious merge commits" bother people so much. Personally I'm much more concerned with what might happen to my individual commits if I'm hitting a conflict during rebase: the commit's diff may no longer be the clear and meaningful diff I indented it to be)
| [Prev in Thread] | Current Thread | [Next in Thread] |