Re: Cleaning up git user-interface warts

From: Junio C Hamano <junkio@cox.net>
Date: Nov 16, 2006, 02:03 UTC
Message-ID: <7vhcx0gnbq.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <455BBCE9.4050503@xs4all.nl>

Han-Wen Nienhuys <hanwen@xs4all.nl> writes:

Show 11 quoted lines

> FWIW, I regularly mess up with the differences between fetching,
> pulling and merging.  In particular, having to do a two step process
> to get remote changes in,
>
>   git pull url-to-server master:master
>      ..error message about not being a fast-forward..
>
>   git pull --update-head-ok url-to-server master:master
>      ..still an error message about update not being a fast-forward..
>
>       (sigh)

Sigh indeed.

Why don't you do the simple and obvious

	git pull url master

or "git pull url" if you already know the master is the branch you are interested in.

The more advanced form of using tracking branches are there and documentation talks about them for completeness but that does not mean you have to use it.