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