git merge origin/master should work. Since master is usually a tracking branch, you could also do git pull from that branch and it will do a fetch & merge for you. If you have local changes on your master that aren’t reflected on origin, you might want git rebase origin/master to make sure your commits … Read more
First, there’s no such concept of “local tracking” branches, only “remote tracking” branches. So origin/master is a remote tracking branch for master in the origin repo. Typically you do git fetch $remote which updates all your remote tracking branches, and creates new ones if needed. However, you can also specify a refspec, but that will … Read more
git fetch origin refs/tags/1.0.0 This fails because it doesn’t write a local reference: it obtains the remote’s refs/tags/1.0.0, and any tag object(s), commits, etc., required to go with it; it drops those into FETCH_HEAD (as all git fetch commands always do); and … that’s it. It never creates reference refs/tags/1.0.0 in your repository, even though … Read more
git fetch origin by default fetches everything from the remote named “origin” and updates (or creates) the so-called “remote-tracking branches” for that remote. Say, for the remote named “origin” which contain branches named “master” and “feature”, running git fetch remote will result in the remote-tracking branches named “origin/master” and “origin/feature” being updated (or created, if … Read more
The following command chain can be used to delete local branches: git branch –v | grep “\[gone\]” | awk ‘{print $1}’ | xargs git branch -D git branch –v lists the local branches verbosely grep “\[gone\]” finds all the branches whose remote branch is gone awk ‘{print $1}’ outputs only the name of the matching … Read more
In case anyone finds this because they specifically want to fetch into the current branch, you can use the –update-head-ok flag. From the docs: -u –update-head-ok By default git fetch refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for git … Read more
You don’t fetch a branch, you fetch an entire remote: git fetch origin git merge origin/an-other-branch
Using git version 1.7.9.5 there is no “remove” command for remote. Use “rm” instead. $ git remote rm upstream $ git remote add upstream https://github.com/Foo/repos.git or, as noted in the previous answer, set-url works. I don’t know when the command changed, but Ubuntu 12.04 shipped with 1.7.9.5. edit: a few people seem to have run … Read more
Try git fetch –dry-run The manual (git help fetch) says: –dry-run Show what would be done, without making any changes.
Try –allow-unrelated-histories Like max630 commented, or as explained here Git refusing to merge unrelated histories