Running git pull performs the following tasks, in order: git fetch git merge The merge step combines branches that have been setup to be merged in your config. You want to undo the merge step, but probably not the fetch (doesn’t make a lot of sense and shouldn’t be necessary). To undo the merge, use git reset –hard to reset the local repository to … Read more
Running git pull performs the following tasks, in order: git fetch git merge The merge step combines branches that have been setup to be merged in your config. You want to undo the merge step, but probably not the fetch (doesn’t make a lot of sense and shouldn’t be necessary). To undo the merge, use git reset –hard to reset the local repository to … Read more
Another way to squash all your commits is to reset the index to master: This isn’t perfect as it implies you know from which branch “yourBranch” is coming from.Note: finding that origin branch isn’t easy/possible with Git (the visual way is often the easiest, as seen here). Note: git branch –show-current has been introduced with Git 2.22 (Q1 20219). EDIT: you will … Read more
Another quicker way is: You don’t need to include –include-untracked if you don’t want to be thorough about it. After that, you can drop that stash with a git stash drop command if you like.
If you want to rename a branch while pointed to any branch, do: If you want to rename the current branch, you can do: If you want to push the local branch and reset the upstream branch: And finally if you want to Delete the remote branch: A way to remember this is -m is for “move” … Read more
git pull origin master will pull changes from the origin remote, master branch and merge them to the local checked-out branch. git pull origin/master will pull changes from the locally stored branch origin/master and merge that to the local checked-out branch. The origin/master branch is essentially a “cached copy” of what was last pulled from origin, which is why it’s called a remote branch in git … Read more
⚠ Important: If you have any local changes, they will be lost. With or without –hard option, any local commits that haven’t been pushed will be lost.[*] If you have any files that are not tracked by Git (e.g. uploaded user content), these files will not be affected. First, run a fetch to update all origin/<branch> refs to latest: Backup your … Read more