Re:Improve your Git commits using patch mode
by jakub_g on Monday November 12, 2012 @05:46AM
(#4772290)
Yep I wrote this with too much shortcuts. What I do is: git checkout typos, git rebase master, [fix typo & commit], git checkout master. This way I accumulate typo fixes in a separate branch, and merge a couple of them at once to master when I see fit (perhaps squashing the typo commits into one beforehand).
Could you maybe elaborate on this a little bit more? I don't think I quite understand this.
My understanding is that you'd have to do a 'git merge master' after you checkout 'typos', make the fix, commit, and then a 'git merge typos' after you checkout 'master'. Then wouldn't this add all of the typos commits into the master branch anyway?
I'm very likely missing something fundamental. (Perhaps my source control habits aren't up to snuff.)