Re: git is screwed

[Artur Malabarba]

2015-03-25 8:29 GMT+00:00 Steinar Bang <address@hidden>:
>>>>>> Richard Stallman <address@hidden>:
>
>> Can someone tell me a full recipe for how to repair lisp/ChangeLog
>> (perhaps, merge it by hand) and how to get the new version into
>> the real repository?
>
> I use magit (not (yet) on GNU Elpa, but available on marmalade (version
> 1.2.2) and Melpa (commit-triggered builds from magit git repo)), and
> what I do, is:

Same here. Magit essentially took me from "I know git
commit/push/pull" to being (almost) a git expert. I'd strongly
recommend it to anyone, even those strugling with the concepts of git.