On Apr 28, 2014, at 02:29, Marat Radchenko <marat@xxxxxxxxxxxxxxxx> 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 line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html