add remote + swap name with origin, gives error: “git fetch origin; git merge” works, != “git pull” has error -why/how?
I've searched high and low to understand this, and I feel it is just slipping through my fingers. There are similar, but not identical, QnAs here.
$ git pull
Your configuration specifies to merge with the ref 'master'
from the remote, but no such ref was fetched.
git fetch gives nothing, followed by
git merge origin which says
Already up-to-date., which is what I expected had
git pull worked 'properly'.
$ cat .git/config
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
url = git://github.com/freenet/wininstaller-official.git
fetch = +refs/heads/*:refs/remotes/official/*
url = git://github.com/freenet/wininstaller-staging.git
fetch = +refs/heads/*:refs/remotes/origin/*
tagopt = --tags
remote = origin
merge = refs/heads/master
remote = origin
merge = refs/heads/master
$ cat .git/refs/remotes/origin/master
$ cat .git/refs/heads/master
Why does git pull give error, whilst git fetch/merge produce the expected output?
Background: I cloned a git repo, freenet/wininstaller-official.git, then saw wininstaller-staging.git and thought "there's likely some not insubstantial overlap there, I ought to add 'staging' as a remote to the first repo". Yeah, now we're cooking with git! This will be so efficient.
Then I thought "staging might be better to track, let's call that origin, and have my local master track new origin/master". Wow! Uber-elte am I!
So I rename remotes as above, delete local master, checkout new master tracking new origin/master.
git fetch; git merge seems to prove it works right!
git pull errors out. Woe is me. Not so uber-elite after all :(
What I have done: git init git remote add master www.xyz.org/git/arkad fatal: 'origin' does not appear to be a git repository fatal: The remote end hung up unexpectedly I have http access to the remo
I am a newbie of git, I try to understand what is origin and origin/master in git, what does the origin means? where it is? and someone says it is remote branch, what is the remote branch?
I am writing a deployment script, this is what it does: # Fetches all branches and tags git fetch origin # Checkout the branch/tag git checkout 2.1.0 If 2.1.0 is a tag I guess I have the latest versi
I want to add these lines to git config. I need a command line solution. [branch master] remote = origin merge = refs/heads/master
I am using TortoiseGit for Windows. I see two branches on remote/origin: HEAD 20 minutes ago Some commit message. master 20 minutes ago Some commit message. I am confused why HEAD shows up as a branc
After fetching from remote using git fetch, we need to use something like git merge origin/master I would like to know if this command also does git commit at the same time? Is the order origin/maste
When I attempt to git pull origin [branch] in order to pull in changes to the repo, I am prompted for a password. My system password and just hitting enter return: fatal: Authentication failed. The
Using git pull used to pull from the remote repository as expected - now, it's asking me to use git pull origin master. I don't quite understand the instructions it's giving me, saying I can add somet
I just cloned a repo and started a new branch in Git. I have done this many times without encountering a problem. Tonight when I tried using git branch --set-upstream develop origin/develop to set the
I'm trying to alias a push command so I don't have to type my branch name all the time, and I'm stalled at this step: Git push new local branch to remote, without having to specify name This command i
Following instructions given [here:] to create a Git repository. All went well until the last line: $ git push -u origin master fatal: 'origin' does not appear to be a git repository fatal: The
When I create a branch using git branch clean_up, a new branch clean_up is created. Now when I execute git branch command, I see two branches clean_up and master, what happened to origin?
The remote repository has two branches: master, develop. Then, I checked my local branch by git branch , I notice I have only master branch, so I run command git fetch origin. After this, when I run
I have a lot of untracked files in my local git repo. Someone accidentially pushed a lot of those untracked files. Now, I want to merge origin/master and I receive: error: The following untracked work
I know about this were written a lot of notes,but they doesn't help me. I have tried git push origin master:master but this doesnt help me? any suggestion? Thanks.
While I am reverting a particular commit in git repository it gives the following error : Command for reverting is **git revert <commit-hash>** error: Commit <commit-hash> is a merge but n
My branch's history is as follows : Now I want to revert merge with branch 558. I have it's sha code, so I'm doing : git revert -m 1 1784adf300f43fb76391e92f80be01132eddb680 and the result is : [mast
I don't get the difference between git rebase origin and git rebase origin/master. In my case I cloned a git repository twice. In the first clone I have to use git rebase origin and in the other clone
when I do a git pull origin master from a branch the branch is updated NOT the master. In order to update the master I need to do a git checkout master and then call git pull origin master. Why
I can say this: git push --all origin and it will push all branches to origin. But if I do this: git pull --all origin then it doesn't pull all the branches from origin, it just returns an error: fa
Start situation (no unpushed changes, > indicates the current branch): o C [> master][origin/master] | o B | o A | ... After a git fetch the log structure often looks like o E [origin/master] |
I am trying to pull changes from remote branch but getting an error which doesn't make sense when I do git pull I get back error: Your local changes to the following files would be overwritten by me
I cloned a github repo after forking it and did git remote add upstream (url) git checkout --track origin/master git checkout develop git checkout -b new_feature_name then some changes and git commit
I am trying to do a 'git pull --rebase', but I don't see any remote changes. When I do a 'git status' I see ' Your branch is ahead of 'origin/master' by 12 commits.' But I am current on my 'dev' branc
I find it little confusing to know the difference between git branch --set-upstream-to vs git remote add origin or even git remote add upstream Basically I have a bare repository created with git init
I've added remote origin like: git remote add origin https://github.com/username/repo.git When I push the git repository, I get this error: git push -u origin master fatal: Unable to find remote help
I'm having trouble comparing local master (which is on same commit as origin/master) with production/master. $ git remote -v origin firstname.lastname@example.org:mydomain/mydomain.git (fetch) origin email@example.com:m
Until now, I used to do: 'git pull origin master' and if there was something to merge, I would get an error, then I could use 'git mergetool' (loads p4merge) to merge files. Now it just writes Fast-fo
I want to add a remote, and a branch of that remote. I did git remote add <newname> <url>, then I did git fetch --all but git branch -a is not showing any branch of the remote. My .git/con
I was taught that you could push to and pull from a remote branch matching the name of your current Git branch by doing: git push origin HEAD or git pull origin HEAD Its always worked for me before,
I created a git mirror of an SVN repository by doing: Create a new repo on github mkdir mirror && cd mirror git svn init [svn url] git svn fetch -rHEAD git remote add origin [github url] git
When I clone a repository from github or any other website and type: git status it checks the current branch for changes against origin remote and shows the message (before making any new commits) : Y
I'm using hub to create a github repository in command, git create -d Some description But without asking me, it automatically add oldUser/repo.git as as remote, Since I'm no longer use oldUser as
When I try to trigger git pull command it is returning an error as follows: mert@eren-VirtualBox:~/restoranya/restoranya$ git pull origin master error: object file .git/objects/2a/0836034919f0cfe0f8f
Per this article, I've tried to get myself in the habit of fetching and merging explicitly when updating my working copy. However, today I made a typo when issuing the command: $ git fetch origin $ g
Sometimes when doing a git pull/merge/checkout I get an error that one or several files can not be created due to permissions. They are probably locked by some process. If the printout is a long one I
I pushed a change to a remote test git repo, then reset my local git repo to HEAD^, and now am trying to push my local repo to origin, but I get a non fast forward merger warning. If I do a git pull
on my new computer, I setup git and my putty.exe and ssh key etc. just fine. So I do a: git pull origin and then at the command prompt, I am asking for a password. I have no idea what password it wan
I have created a remote repo using my GitHub account at https://github.com/darKoram/sphero_tracker.git. So far it just contains some wiki pages, but I'm ready to upload my code. I use git push origin
I installed gitlab on my local machine. It installed fine. When I run the sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production Every check passes. I created a project and a user in gitl
I have a git repository that has a remote set up (git fetch works), but it doesn't have any remote branches: the .git/refs/remotes folder doesn't exist, and git branch -r returns nothing (empty
Is git remote update the equivalent of git fetch?
Possible Duplicate: What exactly does the u do? git push -u origin master vs git push origin master In Github, when you created an empty repository, the instructions ask you to execute git pus
This morning I went to do a git fetch and got the following error: fatal: No remote repository specified. Please, specify either a URL or a remote name from which new revisions should be fetched. T
I have a GIT backup script that runs perfectly when executed from command line (it's a daily backup of our main GIT rep): @echo off rem -- Set Parameters rem -- daliy GIT backup REM Get DATE set mm=%D
I have my project on GitHub at some location firstname.lastname@example.org:myname/oldrep.git. Now I want to push all my code to a new repository at some other location email@example.com:newname/newrep.git. I used the
I'm getting the following error when I try to pull from git. $ git pull origin master key_from_blob: remaining bytes in key blob 266 key_read: type mismatch: encoding error From github.com:mea36/duca2
I've just started using gerrit and i want to know why we need to do git push gerrit HEAD:refs/for/master instead of doing git push origin master If i do git push origin master i get the error saying !
When creating a branch with name that matches that of a remote branch the configurations for push and pull are set differently. Having the current remote branches: $ git branch -r origin/HEAD -> or
My personal repository has some repositories as submodules. And the following command $ git submodule foreach git pull origin master was faced with the following result right after entering ruby repo