Re: Cleaning up git user-interface warts

From: Jakub Narebski <jnareb@gmail.com>
Date: Nov 16, 2006, 01:53 UTC
Message-ID: <ejgg7l$3gb$1@sea.gmane.org>
In-Reply-To: <455BBCE9.4050503@xs4all.nl>

Han-Wen Nienhuys wrote:

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

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.