Re: git fetch vs push, git am questions

From: Konstantin Khomoutov <flatworm@users.sourceforge.net>
Date: Dec 7, 2010, 00:21 UTC
Message-ID: <20101207002104.GG3264@localhost.localdomain>
In-Reply-To: <99351291667275@web152.yandex.ru>

On Mon, Dec 06, 2010 at 11:27:55PM +0300, Konstantin Kivi wrote:

[...]

Show 5 quoted lines

> 1) Is it possible to achieve the same result with git fetch, as I have
> with git push. I have cloned a bare repository (2) from my repository
> (1) and I want fetch made in (2) get all info contained in (1) . I
> talk only about 'master' here. git push from (1) to (2) does the job,
> but git fetch in (1) updates only origin/master, and not master.

`git pull` does exactly that: fetch + merge (which should result in fast-forward in your case).

> I also found that there is a notions of current branch in bare
> repository (master in my case), that stops my experiments of deleting
> master and making new master out of origin/master.  How can I change
> current branch in bare repositry?

By re-writing the HEAD ref (this behaviour is documented in the man page of the `git clone` command, see the "--branch" option for instance). You can use the `git symbolic-ref` to update the HEAD ref.

[...]

P.S. It's a bit strange you're playing with a bare repository in this way. Usually a bare repository is supposed to be pushed to and pulled from, not the other way round. Not that it's bad, but it may turn out you're inventing a convoluted workflow when there may be a simpler solution.