The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to “pull” your system would be forced to overwrite the local files which are not version controlled. Try running git add * git stash git pull This will track all files, remove all of your … Read more
Yes and no. git remote update fetches from all remotes, not just one. Without looking at the code to see if remote update is just a shell script (possible) it, basically, runs fetch for each remote. git fetch can be much more granular.
As Julian said see https://confluence.atlassian.com/display/FISHKB/Git+indexing+fails+due+to+bad+pack+header It really can be a memory issue, and to make sure we don’t lose the solution here it is: git config –global pack.windowMemory “100m” git config –global pack.SizeLimit “100m” git config –global pack.threads “1”
You need to do the following git fetch -p The -p or –prune argument will update the local database of remote branches.
Instead of copying the ref files around (bad bad!) use git update-ref Note that you can have what you wanted pretty easily to a bare repository when pushing instead of pulling. Use this: git clone –mirror . /tmp/bareclone to create the bare repository that you want to keep completely in synch Now, to synch all … Read more
Update: Using Git Switch All of the information written below was accurate, but a new command, git switch has been added that simplifies the effort. If daves_branch exists on the remote repository, but not on your local branch, you can simply type: git switch daves_branch Since you do not have the branch locally, this will … Read more
Here is a slightly easier method I just came up with when researching this: git fetch {remote} git checkout FETCH_HEAD — {file}
It should be pretty obvious from your question that you’re actually just asking about the difference between git merge and git rebase. So let’s suppose you’re in the common case – you’ve done some work on your master branch, and you pull from origin’s, which also has done some work. After the fetch, things look … 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
I’m a bit confused by the commands you use. HEAD is usually a label git uses to track the commit that is currently in the working directory. The git fetch command expects a remote or a remote commit configuration to know what you want fetched. Using git fetch HEAD would indicate HEAD is a remote … Read more