Let\'s say in master
I have a feature disabled.
I work on that feature on branch feature
, so I have a special commit $
there that just
If you want to keep you commits in the same order on feature
you should make a new branch and perform the following. Otherwise just do this on feature
git rebase -i
Move commit $ to the bottom of the list
git checkout master
git rebase feature
It wasn't clear to me on the question but if you didn't want $ at all, rather than moving it delete it after git rebase -i
Though you will want to do this on a new branch so that you don't lose it. As you are changing history.
This also assumes that the branch feature
hasn't been pushed to a remote as rewriting history is bad.