07.12.10, 03:21, "Konstantin Khomoutov" <flatworm@xxxxxxxxxxxxxxxxxxxxx>: > `git pull` does exactly that: fetch + merge (which should result in > fast-forward in your case). pull does not work on bare repos. > > I also found that there is a notions of current branch in bare repository > > How can I change current branch in bare repositry? I think I will understand things better if I get what is 'current branch' for bare repository and how to change it > 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). The repository already exists, so git-clone will not help > You can use the `git symbolic-ref` to update the HEAD ref. > Do you mean something like git symbolic-ref master origin/master ? > [...] > > 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. Yes, I see that push is easier, I only want to be sure I have full control on what is going on. -- С уважением, Константин Киви -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html