Re: A failing attempt to use Git in a centralized environment

On Apr 28, 2014, at 02:29, Marat Radchenko wrote: > In short: > 1. Hack, hack, hack > 2. Commit > 3. Push, woops, reject (non-ff) > 4. Pull > 5. Push Just do pull --rebase? This is essentially the same as what SVN used to do in your setup. -Geert -- To unsubscribe from this list: send the li

Re: possible Improving diff algoritm

On Dec 12, 2012, at 20:55, Morten Welinder wrote: > I was merely asking if an algorithm to pick between the > 2+ choices was allowed to look at the contents of the > lines. > > I.e., an algorithm would look at the C comment > example and determine that the choice starting containing > a full ins

Re: t9401 fails with OS X sed

On Oct 24, 2012, at 23:54, Brian Gernhardt wrote: > It works if I change \s to [[:space:]], but I don't know how portable that is. As \s is shorthand for the POSIX character class [:space:], I'd say the latter should be more portable: anything accepting the shorthand should also accept the full