Having covered the “basic” commands in my previous post, I wanted to look at some of the more advanced stuff. I’m basically meaning things we probably won’t use as regularly as the previous post’s commands.<\/p>\n
Rebasing<\/strong><\/p>\n Rebasing isn’t necessarily advanced in it’s basic form but I’ve not had any real use for it so far apart from in more complicated scenarios.<\/p>\n Rebasing allows us to apply commits from, for example one branch, onto another branch. For example, let’s say we created a branch off of the wrong branch and so want to move commits from the incorrect branch onto the other branch. <\/p>\n So let’s assume we have feature\/mybranch<\/em> and we need to rebase it onto correct_branch<\/em>, then we use<\/p>\n Staging parts of a file<\/strong><\/p>\n Git allows us to stage whole files\/folders as well as parts of a file. For example, maybe we’ve made several changes, but we currently only want to stage a subset of these changes. We can use<\/p>\n We’ll now be presented with a list of the new lines and a lot of options. Selecting ? will list what each of the options means.<\/p>\n We can use commands such as e<\/em> to edit the patch diff file, allowing us to delete lines etc. that are to be staged.<\/p>\n I’ll be adding further “advanced” situations\/commands and when I need them.<\/p>\n","protected":false},"excerpt":{"rendered":" Having covered the “basic” commands in my previous post, I wanted to look at some of the more advanced stuff. I’m basically meaning things we probably won’t use as regularly as the previous post’s commands. Rebasing Rebasing isn’t necessarily advanced in it’s basic form but I’ve not had any real use for it so far […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[206],"tags":[],"class_list":["post-6577","post","type-post","status-publish","format-standard","hentry","category-git-2"],"jetpack_sharing_enabled":true,"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/posts\/6577","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/comments?post=6577"}],"version-history":[{"count":4,"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/posts\/6577\/revisions"}],"predecessor-version":[{"id":6593,"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/posts\/6577\/revisions\/6593"}],"wp:attachment":[{"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/media?parent=6577"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/categories?post=6577"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/putridparrot.com\/blog\/wp-json\/wp\/v2\/tags?post=6577"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}\r\ngit rebase --onto correct_branch feature\/mybranch \r\ngit force push\r\n<\/pre>\n
\r\ngit add --patch filename\r\n\r\n\/\/ or short form\r\n\r\ngit add --p filename\r\n<\/pre>\n