Git: move a commit “on top”

前端 未结 2 1001
孤独总比滥情好
孤独总比滥情好 2020-12-14 00:45

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

相关标签:
2条回答
  • 2020-12-14 01:37

    git rebase -i B, and then move $ to the end of the list that shows up in your editor. It will start out as the first line in the file that opens. You could also just delete that line entirely, which will just drop that commit out of your branch's history.

    0 讨论(0)
  • 2020-12-14 01:43

    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 <sha for commit B>
    

    Move commit $ to the bottom of the list

    git checkout master
    git rebase feature <or the other branch name>
    

    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.

    0 讨论(0)
提交回复
热议问题