If you then type y or just hit return, it will perform the reset. Reset dev-container to qcpp/dev-container? (Y/n) For example if you're on branch dev-container with remote called qcpp/dev-container and you enter git catchup, you'll be prompted: Since reset is a potentially dangerous call (especially with the -hard option, you will lose any uncommitted changes), it first tells you what it's about to do.
Git reset -hard $(git for-each-ref -format='%(upstream:short)' $(git symbolic-ref -q HEAD))
Properly formatted (won't work with the newlines in. Unlike the other answer there is no hardcoded branch name in this alias.Ĭatchup = "!f() f" I therefore created the following alias "catchup", which allows doing this for the current branch. I have a private repo on a server and regularly rebase/force-push to it, which makes it necessary to reset the local branch on my other computer often. Resetupstream = !git fetch upstream & git reset -hard upstream/master & git clean -f -d Resetorigin = !git fetch origin & git reset -hard origin/master & git clean -f -d This blog post suggests those aliases (for master branch only, but you can adapt/extend those): That restores the index and working tree, like a git reset -hard would.Īs commented by Brad Herman, a reset -hard would remove any new file or reset modified file to HEAD.Īctually, to be sure you start from a "clean slate", a git clean -f -d after the reset would ensure a working tree exactly identical to the branch you just reset to. Your branch is up to date with 'origin/master'. Namely: git switch -C mybranch origin/mybranchĮxample C:\Users\vonc\git\git>git switch -C master origin/masterīranch 'master' set up to track remote branch 'master' from 'origin'. With Git 2.23 (August 2019), that would be one command: git switch. Note that just after the reset, refers to the old commit, before reset.īut if you had already pushed, see " Create git branch, and revert original to upstream state" for other options. (Make sure that you reference your latest commit in a separate branch, like you mention in your question) If you haven't pushed to origin yet, you can reset your branch to the upstream branch with: git checkout mybranch
0 kommentar(er)
