From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 01 May 2014 19:27:43 GMT
Subject: Re: Pull is Evil
Message-ID: <5362a02f5a153_76612eb2f071@nysa.notmuch>
In-Reply-To: <20140501094610.GB75770@vauxhall.crustytoothpaste.net>

brian m. carlson wrote:
> At work, we have a workflow where we merge topic branches as
> non-fast-forward, so that we have a record of the history (including
> who reviewed the code), but when we want to just update our local
> branches, we always want fast-forward:
> 
>   git checkout maintenance-branch
>   # Update our maintenance branch to the latest from the main repo.
>   git pull --ff-only

If we make it the default, you only need to type `git pull`.

>   git pull --no-ff developer-remote topic-branch

I don't see anything wrong with having to type --no-ff if that's what
you really want.

>   git push main-repo HEAD

main-repo/maintenance-branch should be the upstream of
maintenance-branch, in which hase:

% git push

-- 
Felipe Contreras