Hi Peter, On Oct 3, 2012, at 12:32 AM, Peter Rosin <p...@lysator.liu.se> wrote: > [snipped loads of stuff]
[snipped a bit more stuff] > You're saying that you are about to: > > $ git checkout master > $ git merge --strategy=recursive -X theirs gary/reredo-test-operand-order \ > -m 'bla bla bla' > > right? Pretty much. But that's just to show the merge in git history, the end effect will be identical to having committed the diff back to master. > Is that better than committing the diff between reredo-... and master > as a revert-light? Why else would you have gone through all the trouble > of making all the smaller commits in the first place? It's better to show the branch merged in for future archaeology; the less time anyone else has to waste staring at 962aa91, the better a place the world will be. And I'm all about making the world a better place! :-) > I just fired up a test suite run... Thanks! I'm crossing my fingers -- I'll sleep a lot better when we've put this one behind us. Cheers, -- Gary V. Vaughan (gary AT gnu DOT org)
