From: Johannes Sixt <j.sixt@viscovery.net>
Date: Tue, 09 Dec 2008 10:00:30 GMT
Subject: Re: Forcing --no-ff on pull
Message-ID: <493E41BE.4050809@viscovery.net>
In-Reply-To: <1228815240.18611.48.camel@starfruit.local>

R. Tyler Ballance schrieb:
> The most common use-case involves a user merging a project branch into a
> stabilization branch (`git checkout stable && git pull . project`) in
> such a way that no merge commit is generated. Of course, without
> thinking they'll push these changes up to the centralized repository.
> Not 15 minutes later they realize "ruh roh! I didn't want to do that"
> and become very frustrated that they have to resort to asking for help
> or hand-reverting N number of commits. 

Is the problem

 * that there is no merge commit, or

 * that you have to undo N commits instead of just one?

The latter is probably helped by

   $ git reset --hard ORIG_HEAD && git push -f origin

-- Hannes