Tag Archives: Magit

Magit Log for a File

Here’s a really nice tip from Wilfred Hughes’ Emacs Command of the Day Twitter feed: M-x magit-log-buffer-file: shows all the commits that affected the current file. Great for understanding the history of some code! pic.twitter.com/psiuHb2cQm — Ⓔ Command of the … Continue reading

Posted in General | Tagged , | 1 Comment

Magit Kickstarter

Regular readers know that I’m a huge fan of Magit. It is, along with Org Mode, one of the killer apps in Emacs. Now Jonas Bernoulli has announced a Kickstarter campaign to fund further development: Magit, the magical Git client … Continue reading

Posted in General | Tagged , | 4 Comments

Magit Bisect Tutorial

The other day, I wrote about Guowei Lv’s two very nice tutorials on using Magit rebase. Now Lv has another tutorial out on using Magit bisect. When you’re trying to track down which commit introduced an error, the Git bisect … Continue reading

Posted in General | Tagged , | Leave a comment

Magit Rebase Tutorial

Guowei Lv has a very nice two-part tutorial on using Git rebase with Magit. Rebase often seems to cause confusion with n00bs—at least it did with me—so I’m always happy to see more tutorials about it. If you’re a visual … Continue reading

Posted in General | Tagged , | Leave a comment

Creating a Branch from the Current Git State

Kris Jenkins, whose wonderful video I’ve written about before, has posted a very handy Magit tip. What do you do if you want to add a feature branch but start working on it before creating the branch? What you’d like … Continue reading

Posted in General | Tagged , | 3 Comments

Emacs and Magit

There’s been some contretemps lately concerning Emacs and Magit. The issue is that Magit can’t be integrated into Emacs because not all the contributors have filed a copyright assignment. RMS is even on record wishing that someone would recreate Magit … Continue reading

Posted in General | Tagged , | 16 Comments

Resolving Merge Conflicts with magit-ediff

A while back I was whining about never remembering how to resolve a merge conflict and took note of thapakazi’s recommendation to use smerge. In the comments, Irreal regular Phil strongly urged me to get comfortable with ediff and use … Continue reading

Posted in General | Tagged , | Leave a comment

Introductory Magit Video

Arjen Wiersma has a very nice introductory video on Magit. He covers the basic usage such as staging, committing, creating and checking out branches, and logging. If you’re just coming to Magit, it serves as good way to get oriented. … Continue reading

Posted in General | Tagged , | Leave a comment

Merging with smerge

I don't often have occasion to resolve git merge conflicts so I never remember the details and end up changing things by hand. This tweet C-c ^ m (smerge-keep-mine)... Resolving conflicts with #emacs https://t.co/kNa6bDc2kG — (@milanthapa_) October 16, 2016 caught … Continue reading

Posted in General | Tagged , | 11 Comments

Magit Video on Rebasing

Charl Botha has posted an excellent video on advanced rebasing with Magit. It serves as a great followup to Howard Abrams' Magit tutorial video. Abrams covered rebasing too but Botha shows how to perform more complicated tasks. First he shows … Continue reading

Posted in General | Tagged , | Leave a comment