hey my IRC bouncer is being stupid, here i am need some assistance splitting the commit? Ok nice, yes I do^^ I'm currently in the getblockbyheight branch on my local repository ok so if it's the last commit you can always `git reset HEAD~` which will "back out" the commit but keep the diff git log shows only one commit now `git diff` The "rpc: Add getblockbyheight" should see all your changes in last commit right? I got this output "Unstaged changes after reset: M src/rpc/blockchain.cpp M test/functional/rpc_blockchain.py " luckily these changes are in two files which makes this easier. Next you can `git commit src/rpc/blockchain.cpp -m "fixup! rpc: Add getblockbyheight"` after that `git diff` should only show the test changes from there `git commit -am "rpc: Add test for getblockbyheight"` you'll have 3 commits tell me if you make it there or are confused I made it, git log now shows 3 commits ok great, and one is a fixup! right? now my favorite mode of operation: `git rebase -i HEAD~3` which means "interactive rebase the last 3 commits" Yes, but I did a small typo hope it isn't a big deal. I've forgot the space after "rpc:" will give you a commit list of 3 last commits it's fine you'll se esomething like : pick deadbeef Commit message I know I think I need to change the pick correct 2nd pick to "f" aka fixup drops the commit message and squashes f(ixup) both work. s(quash) keeps the commit message then exit and save changes, should be good to go So on line to "pick" => "fixup" yep, or just "f" Done ok you should have two good-looking commits now Yes I do once you're satisfied force-push to your repo ok, sorry if im patronizing not sure of git level of expertise Done now, if the two sets of changes were in one file, the fix is a bit more subtle instead of `git commit` those two files separately, I use `git add -p ` which lets you pick and choose the sub-parts Ok, thank you a lot :-) Can I post this chat on github (As a link to a pastebin)? So others can benefit from it in future sure Ok thanks :)