From the theoretical point of view: tags are symbolic names for a given revision. They always point to the same object (usually: to the same revision); they do not change. branches are symbolic names for line of development. New commits are created on top of branch. The branch pointer naturally advances, pointing to newer and … Read more
Wow, that was easier than I thought: git checkout -b newbranch v1.0
git remote prune origin, as suggested in the other answer, will remove all such stale branches. That’s probably what you’d want in most cases, but if you want to just remove that particular remote-tracking branch, you should do: git branch -d -r origin/coolbranch (The -r is easy to forget…) -r in this case will “List … Read more
This should work: git show branch:file Where branch can be any ref (branch, tag, HEAD, …) and file is the full path of the file. To export it you could use git show branch:file > exported_file You should also look at VonC’s answers to some related questions: How to retrieve a single file from specific … Read more
For the vast majority[1] of visitors here, the correct and simplest answer to the question “How do I list all remote branches in Git 1.7+?” is: git branch -r For a small minority[1] git branch -r does not work. If git branch -r does not work try: git ls-remote –heads <remote-name> If git branch -r … Read more
First, what is the result of git branch -a on machine B? Second, you have already deleted heads/devel on origin, so that’s why you can’t delete it from machine B. Try git branch -r -d origin/devel or git remote prune origin or git fetch origin –prune and feel free to add –dry-run to the end … Read more
The closest thing to renaming is deleting and then recreating on the remote. For example: git branch -m master master-old git push remote :master # Delete master git push remote master-old # Create master-old on remote git checkout -b master some-ref # Create a new local master git push remote master # Create master on … Read more
git branch –force <branch-name> [<new-tip-commit>] If new-tip-commit is omitted, it defaults to the current commit. new-tip-commit can be a branch name (e.g., master, origin/master).
You have two options: The first is a merge, but this creates an extra commit for the merge. Checkout each branch: git checkout b1 Then merge: git merge origin/master Then push: git push origin b1 Alternatively, you can do a rebase: git fetch git rebase origin/master
Just git branch without options. From the manpage: With no arguments, existing branches are listed and the current branch will be highlighted with an asterisk.