If another_branch already exists locally and you are not on this branch, then git checkout another_branch switches to the branch. If another_branch does not exist but origin/another_branch does, then git checkout another_branch is equivalent to git checkout -b another_branch origin/another_branch; git branch -u origin/another_branch. That’s to create another_branch from origin/another_branch and set origin/another_branch as the … Read more
This question already has answers here: fatal: Not a git repository (or any of the parent directories): .git Git: Receiving “fatal: Not a git repository” when attempting to remote add a Git repo When I tried to push an existing repository on github.com, and it when I entered the command the website prompted me to … Read more
Just do: or if you have a specific repo: This will delete your previous commit(s) and push your current one. It may not be proper, but if anyone stumbles upon this page, thought they might want a simple solution… Short flag Also note that -f is short for –force, so will also work.
With git reflog check which commit is one prior the merge (git reflog will be a better option than git log). Then you can reset it using: There’s also another way: It will get you back 1 commit. Be aware that any modified and uncommitted/unstashed files will be reset to their unmodified state. To keep them either stash changes … Read more
git pull origin master pulls the master branch from the remote called origin into your current branch. It only affects your current branch, not your local master branch. It’ll give you history looking something like this: Your local master branch is irrelevant in this. git pull is essentially a combination of git fetch and git merge; it fetches the remote branch then … Read more
Really the ideal way to do this is to not use pull at all, but instead fetch and reset: (Altering master to whatever branch you want to be following.) pull is designed around merging changes together in some way, whereas reset is designed around simply making your local copy match a specific commit. You may want to consider slightly different options to clean depending on your system’s … Read more
If you want to merge your branch to master on remote, follow the below steps: push your branch say ‘br-1’ to remote using git push origin br-1. switch to master branch on your local repository using git checkout master. update local master with remote master using git pull origin master. merge br-1 into local master using git merge br-1. … Read more
How I would do this If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what I want to push and also I wouldn’t push things at all, that are … Read more
This depends a lot on what you mean by “revert”. Temporarily switch to a different commit If you want to temporarily go back to it, fool around, then come back to where you are, all you have to do is check out the desired commit: Or if you want to make commits while you’re there, … Read more
Undo a commit & redo This command is responsible for the undo. It will undo your last commit while leaving your working tree (the state of your files on disk) untouched. You’ll need to add them again before you can commit them again). Make corrections to working tree files. git add anything that you want … Read more