I\'m writing some scripts for my Git workflow.
I need to reset other (existing) branch to the current one, without checkout.
Before:
Current
You can sync with this command your branches at any time
$ git push . CurrentBranch:OtherBranch -f
Also without -f it replace this set of commands
$ git checkout OtherBranch
$ git merge CurrentBranch
$ git checkout CurrentBranch
It can be useful when you don't need commit all your files in CurrentBranch and so you can't switch to another branches.
Set otherbranch
to point at the same commit as currentbranch
by running
git branch -f otherbranch currentbranch
The -f
(force) option tells git branch
yes, I really mean to overwrite any existing otherbranch
reference with the new one.
From the documentation:
-f
--forceReset to if exists already. Without -f git branch refuses to change an existing branch.
The workflows you describe are not equivalent: when you perform reset --hard
you lose all the changes in the working tree (you might want to make it reset --soft
).
What you need is
git update-ref refs/heads/OtherBranch refs/heads/CurrentBranch