From: Howard Miller Date: Tue, 15 Sep 2009 14:11:57 GMT Subject: Re: Commited to wrong branch Message-ID: <26ae428a0909150711h1f7bc593j541d5eb7201a7e45@mail.gmail.com> In-Reply-To: <46a038f90909150654t73cab47ckfd02f8a2f4353722@mail.gmail.com> 2009/9/15 Martin Langhoff : > 2009/9/15 Björn Steinbrink : >> [Please stop top-posting...] > > Not everyone is deep in mailing-list lore :-) -- we can help anyway. > > Howard, I see you're wondering about it: http://www.idallen.com/topposting.html > >> Just don't use patch(1), there's no sane reason to do that, you're >> sacrificing all of what git can offer there. > > Oh, yes there is, specially for newcomers used to patch, and how it > handles conflicts. > > In this case, I happen to know that Howard is a refugee from CVS land > (the moodle project in this case), and he is familiar with the output > of patch if things go wrong. > > It's not what I'd recommend to someone that is deep in git-land. But > even myself (with a bit of code in git) sometimes use patch when > git-apply tries to be too clever and I just want a damn .rej file to > review and edit with emacs. > > cheers, > > > m > -- >  martin.langhoff@gmail.com >  martin@laptop.org -- School Server Architect >  - ask interesting questions >  - don't get distracted with shiny stuff  - working code first >  - http://wiki.laptop.org/go/User:Martinlanghoff > ...and I still don't understand cvs either :-) (NB. I have put my reply at the bottom where nobody will see it - this is why forums are better than mailing lists.... >ducks<)