Emacs Rocks! Episode 17: Magit

Emacs Rocks! Episode 17: Magit

Emacs Rocks!: Magit

If you're an emacs user, I can't recommend magit 1 enough. I was a diehard CLI user and had flags and aliases out the wazoo, and it was still a step change in usabilty and power for me. Staging hunks, rebasing, and stashing are all vastly easier. Amending or editing a commit is a breeze, and it's tied in to all of the other emacs tools you already use, e.g. org-mode to boot! It's easier to see it in action than explain it. If you've two minutes to spare, check out this emacsrocks screencast 2, or Howard Abram's longer presentation from the PDX Emacs Hackers meetup 3. 1: link 2: link to this video 3: link

I cannot possibly encourage you more to check out magit. It is unbelievably good. I always share this demo with people to show off just a tiny portion of what it's capable of doing link to this video My skills with git have gotten better after using magit, too, because it brings the power of git to the surface. It's a really fantastic git porcelain and the fact that it is deeply integrated into Emacs just makes it absolutely second to none. Magit is easily one of my favorite pieces of software and I will leap at the chance to sing its praises.

There is Magit Forge which is not limited to Github link If you are not familar with Magit, there is a screencast: Emacs Rocks! Episode 17: Magit link to this video

Not sure about other editors, but Magit's hunk- and line-level staging/unstaging is hard to beat, IMO. For hunk-level staging, you put your cursor on the hunk you want to add and press "s". If you want to split that and only stage a few lines, you just select those lines and press "s". This demo is pretty good I think: link to this video

Workflow for fetching from upstream with magit I was very impressed with the latest emacsrocks on using magit: link to this video However, Magnars doesn't actually explain how he does what he does in this one. In particular, I'm interested in how he fetches from upstream, opens the new commit and modifies it before merging it into his local branch (see 0:30-0:45 in the video). How is this done? I understand I can fetch from upstream with `f u`, which creates a section in magit-status for "unpulled commits". And I can open the unstaged commits by hitting enter with point on the commit, which opens the commit in a magit-rev buffer. This is where I get lost - how do I then edit the commit before merg…

The video is indeed... not so great. I would go as far as to say that this might be the Kickstarter campaign with the crappiest video that ever succeeded. But at some point I just had to launch instead of continuing to hope I would eventually get around to launching the perfect campaign. I did however make an effort to give non-Emacs a better glimpse into how Magit works using a few articles listed at 1. You might also want to check out some of the screencasts that were created by users 2. 1 link 2 link to this video link

> It’s really that good It reminds me (I hear it in the voice of the narrator) "Emacs Rocks! Episode 17: Magit" link to this video