Created
January 24, 2013 11:12
-
-
Save lukearmstrong/4620141 to your computer and use it in GitHub Desktop.
forward port bugs onto minor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<MrAlanSir> right what whealer says seems portable | |
<MrAlanSir> so you 1) git co -b feature-forwardport bugs | |
<MrAlanSir> This makes the feature-forwardport branch at the end of the bugs branch | |
<MrAlanSir> Then you 2) git rebase --onto minor $hash feature-forwardport | |
<MrAlanSir> And to find $hash you look at git lg and find the start of what you consider to be the stuff you want | |
<MrAlanSir> which is probably going to be the last-tagged minor version since that's where bugs branches are based | |
<MrAlanSir> but you might already have some bugs forward-ported so that's not universally true | |
<MrAlanSir> Then you'll have a feature-forwardport branch containing all the bugfix commits | |
<MrAlanSir> and it'll be based on minor | |
<MrAlanSir> throw a -p into that rebase to keep the lumps | |
<MrAlanSir> Any remaining confusion would involve me putting my shoes and jumper back on so try not to have any |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
For simplicity:
git co -b feature-forwardport bugs
git rebase -p --onto minor $hash feature-forwardport