-
Recent Posts
Links
Archives
- March 2025
- February 2025
- January 2025
- December 2024
- November 2024
- October 2024
- September 2024
- August 2024
- July 2024
- June 2024
- May 2024
- April 2024
- March 2024
- February 2024
- January 2024
- December 2023
- November 2023
- October 2023
- September 2023
- August 2023
- July 2023
- June 2023
- May 2023
- April 2023
- March 2023
- February 2023
- January 2023
- December 2022
- November 2022
- October 2022
- September 2022
- August 2022
- July 2022
- June 2022
- May 2022
- April 2022
- March 2022
- February 2022
- January 2022
- December 2021
- November 2021
- October 2021
- September 2021
- August 2021
- July 2021
- June 2021
- May 2021
- April 2021
- March 2021
- February 2021
- January 2021
- December 2020
- November 2020
- October 2020
- September 2020
- August 2020
- July 2020
- June 2020
- May 2020
- April 2020
- March 2020
- February 2020
- January 2020
- December 2019
- November 2019
- October 2019
- September 2019
- August 2019
- July 2019
- June 2019
- May 2019
- April 2019
- March 2019
- February 2019
- January 2019
- December 2018
- November 2018
- October 2018
- September 2018
- August 2018
- July 2018
- June 2018
- May 2018
- April 2018
- March 2018
- February 2018
- January 2018
- December 2017
- November 2017
- October 2017
- September 2017
- August 2017
- July 2017
- June 2017
- May 2017
- April 2017
- March 2017
- February 2017
- January 2017
- December 2016
- November 2016
- October 2016
- September 2016
- August 2016
- July 2016
- June 2016
- May 2016
- April 2016
- March 2016
- February 2016
- January 2016
- December 2015
- November 2015
- October 2015
- September 2015
- August 2015
- July 2015
- June 2015
- May 2015
- April 2015
- March 2015
- February 2015
- January 2015
- December 2014
- November 2014
- October 2014
- September 2014
- August 2014
- July 2014
- June 2014
- May 2014
- April 2014
- March 2014
- February 2014
- January 2014
- December 2013
- November 2013
- October 2013
- September 2013
- August 2013
- July 2013
- June 2013
- May 2013
- April 2013
- March 2013
- February 2013
- January 2013
- December 2012
- November 2012
- October 2012
- September 2012
- August 2012
- July 2012
- June 2012
- May 2012
- April 2012
- March 2012
- February 2012
- January 2012
- December 2011
- November 2011
- October 2011
- September 2011
- August 2011
- July 2011
- June 2011
- May 2011
- April 2011
Categories
Meta
Tag Archives: Magit
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
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
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
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
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
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
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
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
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
A Magit Tip
A nice tip from Wilfred Hughes for Magit users: Emacs tip of the day: you can use ! to explicitly run git commands inside magit. Handy for deleting large directories: ! rm -r somedir — Wilfred Hughes (@_wilfredh) January 20, … Continue reading