Comment by pitaj

Comment by pitaj 2 days ago

4 replies

I prefer just using `git switch` because it's easy to remember the flags (and the position of arguments), but you're right, there is a simpler way:

    git switch -c some-new-branch-name
    git branch -f master HEAD~
DangitBobby 2 days ago

You should also be able to do

  git branch -f master origin/master
  • pitaj 2 days ago

    This doesn't work if your local master was already ahead of origin

    • DangitBobby 2 days ago

      Indeed, as with all of these examples exceptions will apply and, it's a good idea to check the log before taking any such action. I believe your example also depends on exactly how many commits you've made that need to be moved. In any case, it depends on me remembering exactly what `~` signifies.