From: Matthias Lederhofer <matled@gmx.net>
Date: Thu, 28 Jun 2007 11:33:46 GMT
Subject: Re: [PATCH] git-merge-ff: fast-forward only merge
Message-ID: <20070628113346.GA4914@moooo.ath.cx>
In-Reply-To: <1182830470640-git-send-email-sam.vilain@catalyst.net.nz>

Sam Vilain <sam.vilain@catalyst.net.nz> wrote:
> This is primarily so that there is an easy switch to 'git-pull' to
> be sure to fast forward only.
> ---
>  Documentation/merge-strategies.txt |    5 +++++
>  Makefile                           |    2 +-
>  git-merge-ff.sh                    |    8 ++++++++
>  3 files changed, 14 insertions(+), 1 deletions(-)
>  create mode 100644 git-merge-ff.sh

git-merge-ff.sh should be executable, added to .gitignore and the
strategy should be added to the available strategies.

And somehow it did not work for me at all:

% git merge -s ff origin/master
git-merge.sh: needs update   
Trying really trivial in-index merge...
Wonderful.
In-index merge
[..]
% git show HEAD|grep Merge
Merge: 117a93c... f578825...
    Merge commit 'origin/master'