You are currently in a detached HEAD state. To resolve that, all you need to do is create a new branch with git branch <branchname> or git checkout -b <branchname>. That will leave you with a local branch you can play with, and even delete when you’re done with it. Branches in git are just … Read more
It’s important that it should be done without grep, sed, tail or even ghc -e wrappers, only with true git power, because of their unsafeness and variation. That is only true for git porcelain commands (see “What does the term porcelain mean in Git?”) Use the plumbing command ls-remote, and then you will be able … Read more
It’s not possible. The changes you commit are related to the current working copy. If you want to commit to another branch it means that you could commit changes from your working copy, but base them from another copy state. This is not a natural way of versioning your work, and this is why you … Read more
TL;DR You can git checkout master at this point. Longer description (but still not that long) You are doing this the hard way. In the future, instead of: mkdir repo cd repo git init git remote add origin <url> git fetch origin git checkout master you can simply run: git clone <url> repo since the … Read more
I generally find it unnecessary to use git fetch. git pull is sufficient. git pull will synchronize your repository with the remote. The new_feature_branch will then be available. git checkout new_feature_branch will notice the branch in origin and create a new local tracking branch for you and switch to that branch. git pull git checkout … Read more
It looks like the first merge was a fast-forward, and the second one was a three-way merge. Explanation Git has two versions of merge: fast-forward and three-way. (There are other versions, but that is not what happened here.) The default behavior is to do a fast-forward merge when possible, and otherwise do a three-way merge. … Read more
Like the others said, if the branch you are looking for isn’t local to the repository on which you are blaming this commit (e.g. a branch only in the personal repo of a distant developer), you are screwed. But assuming that sought-after branch is something you can see, and that of course you have the … Read more
If you don’t need the branch around: If you’ve merged foo back to master, “git branch -d foo” to kill the topic branch, and then “checkout -b foo” in the future when you need to hack on it again. If you do need the branch around: You can rebase your topic branch against the master … Read more
Option 1 git checkout -f gh-pages Option 2 git reset –hard # beware: don’t make that a habit git checkout gh-pages
Here’s one alternative: use non-branch references to save the branch-tips before deleting the branch names. Since these are non-branch references, they won’t show up in git branch output, nor in stuff shown by git log –branches and gitk –branches, for instance. However, they will show up in –all listings, and will retain repository objects. To … Read more