{"id":6481,"date":"2017-08-08T12:03:00","date_gmt":"2017-08-08T16:03:00","guid":{"rendered":"http:\/\/irreal.org\/blog\/?p=6481"},"modified":"2017-08-08T12:03:33","modified_gmt":"2017-08-08T16:03:33","slug":"magit-rebase-tutorial","status":"publish","type":"post","link":"https:\/\/irreal.org\/blog\/?p=6481","title":{"rendered":"Magit Rebase Tutorial"},"content":{"rendered":"

Guowei Lv has a very nice two-part tutorial<\/a> on using Git rebase with Magit. Rebase often seems to cause confusion with n00bs\u2014at least it did with me\u2014so I’m always happy to see more tutorials about it. If you’re a visual learner, Howard Abrams has a nice video on the subject that I wrote about previously<\/a>. If you prefer to read about a subject at your own pace, you may prefer Lv’s tutorial. If, like me, you like to first see a video to get an overview and then read a tutorial to understand the details, you should first watch Abrams’ video and then read the tutorial. <\/p>\n

In the first part, Lv shows how to amend the commit message for a commit other than the last one. Then he moves on to showing how to squash two or more commits into a single one. The need for this happens a lot to me so it’s nice to know how to get everything into a single commit. <\/p>\n

On the other hand, sometimes you need to split a commit into two or more parts. He also shows how to do this. Again, this is something that comes up more than you’d expect. <\/p>\n

The second tutorial<\/a> considers how to use rebase to merge branches. My problem with rebasing is that I don’t do it enough to remember the details. I can always go back and watch Abrams’ video to refresh my memory but that seems like overkill. Lv’s tutorial is nice because it serves as a go-by for the common cases and I can just bookmark it and refer to it when I need to. <\/p>\n","protected":false},"excerpt":{"rendered":"

Guowei Lv has a very nice two-part tutorial on using Git rebase with Magit. Rebase often seems to cause confusion with n00bs\u2014at least it did with me\u2014so I’m always happy to see more tutorials about it. If you’re a visual … Continue reading →<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[5],"tags":[18,59],"class_list":["post-6481","post","type-post","status-publish","format-standard","hentry","category-general","tag-emacs","tag-magit"],"_links":{"self":[{"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/6481","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=6481"}],"version-history":[{"count":1,"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/6481\/revisions"}],"predecessor-version":[{"id":6482,"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/6481\/revisions\/6482"}],"wp:attachment":[{"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=6481"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=6481"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/irreal.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=6481"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}