git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Graeme Geldenhuys <graemeg.lists@gmail.com>
To: git@vger.kernel.org
Subject: git-pull doesn't update my refs for remotes/origin/master
Date: Mon, 25 Jul 2011 09:58:54 +0200	[thread overview]
Message-ID: <4E2D223E.8090505@gmail.com> (raw)

Hi,

Any idea why this happens? When I do a 'git pull origin master' while in
the master branch, it fetches all the latest commits, but doesn't update
the 'remotes/origin/master' reference. When I do a 'gitk', the
remotes/origin/master reference is still pointing to the old original
HEAD commit. Only when I do a 'git push origin master', does it update
the remotes/origin/master references?

I'm using git version 1.7.0.4 as is include with Ubuntu 10.04

Here is my .git/config file:

----8<-------------8<-------------8<-------------8<-------------8<----
[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
	safecrlf = true
[remote "origin"]
	url = ssh://graemeg@fpgui.git.sourceforge.net/gitroot/fpgui/fpgui
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[gui]
	geometry = 1182x686+1573+97 387 428
	wmstate = normal
[push]
	default = current
[remote "usb"]
	url = /media/flash16gig/git_repos/fpgui.git
	fetch = +refs/heads/*:refs/remotes/usb/*
[branch "v0.4_fixes"]
	remote = origin
	merge = refs/heads/v0.4_fixes
[remote "github"]
	url = git@github.com:graemeg/fpGUI.git
	fetch = +refs/heads/*:refs/remotes/github/*
----8<-------------8<-------------8<-------------8<-------------8<----


Regards,
  - Graeme -

-- 
fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal
http://fpgui.sourceforge.net/

             reply	other threads:[~2011-07-25  7:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-25  7:58 Graeme Geldenhuys [this message]
2011-07-25  8:35 ` git-pull doesn't update my refs for remotes/origin/master Michael J Gruber
2011-07-25  8:48   ` Graeme Geldenhuys

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4E2D223E.8090505@gmail.com \
    --to=graemeg.lists@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).