{"id":1221,"date":"2009-01-12T01:30:55","date_gmt":"2009-01-11T23:30:55","guid":{"rendered":"http:\/\/vizZzion.org\/blog\/2009\/01\/merging-branches-upstream-with-git\/"},"modified":"2009-01-12T01:30:55","modified_gmt":"2009-01-11T23:30:55","slug":"merging-branches-upstream-with-git","status":"publish","type":"post","link":"https:\/\/vizZzion.org\/blog\/2009\/01\/merging-branches-upstream-with-git\/","title":{"rendered":"Merging branches upstream with Git."},"content":{"rendered":"

This is one of those “I write it on my blog so I can easily find it
\n back<\/em>”
\n posts, that’s hopefully useful to someone out there.
For KDE development, I’m using git and git-svn to manage the codebase. Earlier today, I’ve merged a branch I had created over new year’s holiday. It consisted of 25 patches, some larger (implementing a new feature), some smaller, cleanups, but also some patches I wanted to keep separate for easier reference and review. I didn’t want to commit it to KDE’s SVN as one huge commit, but also not as 25, with a lot of those smaller ones that were more the “savegame” type of commit you do once in a while to easily get back to a “working state” when you’re about to break things or experiment.
Git’s rebase tool is what I wanted then. I’ve started off with my branch, counted it was 25 commits I want to restructure.<\/p>\n

git rebase --interactive HEAD~25<\/pre>\n
        Gives you a list you can pick commits from. Every commit is shown on one    line, starting with the keyword “pick”. For commits you want to keep as-is, leave that line alone. Make it “squash” to combine this commit with the one on the previous line. Write “edit” to tweak the commit message. Just remove the commits you don’t want. Git will instruct you to do what’s needed, changing a log message, possibly solving a conflict. You pick up the rebasing process with<\/p>\n
git rebase --continue<\/pre>\n
        then. If you’re done, you can merge your branch, for example using “git svn dcommit” (do check with “git log”, “git show” and “git svn dcommit -n” first if everything worked OK).<\/p>\n","protected":false},"excerpt":{"rendered":"
This is one of those “I write it on my blog so I can easily find it back” posts, that’s hopefully useful to someone out there. For KDE development, I’m using git and git-svn to manage the codebase. Earlier today, I’ve merged a branch I had created over new year’s holiday. It consisted of 25… Continue reading Merging branches upstream with Git.<\/span> →<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[29],"tags":[],"class_list":["post-1221","post","type-post","status-publish","format-standard","hentry","category-kde"],"_links":{"self":[{"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/posts\/1221","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/comments?post=1221"}],"version-history":[{"count":0,"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/posts\/1221\/revisions"}],"wp:attachment":[{"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/media?parent=1221"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/categories?post=1221"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/vizZzion.org\/blog\/wp-json\/wp\/v2\/tags?post=1221"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}