From: Jakub Narebski <jnareb@gmail.com>
Date: Thu, 16 Nov 2006 01:53:08 GMT
Subject: Re: Cleaning up git user-interface warts
Message-ID: <ejgg7l$3gb$1@sea.gmane.org>
In-Reply-To: <455BBCE9.4050503@xs4all.nl>

Han-Wen Nienhuys wrote:

> 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..

What about:

     git pull --update-head-ok url-to-server +master:master

(or --force, but be careful with that one)?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git