git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Matthias Lederhofer <matled@gmx.net>
Cc: Sam Vilain <sam.vilain@catalyst.net.nz>, git@vger.kernel.org
Subject: Re: [PATCH] git-merge-ff: fast-forward only merge
Date: Thu, 28 Jun 2007 14:01:18 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0706281400530.4438@racer.site> (raw)
In-Reply-To: <20070628113346.GA4914@moooo.ath.cx>

Hi,

On Thu, 28 Jun 2007, Matthias Lederhofer wrote:

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

To prevent something like this to happen, may I suggest adding a really 
simple, small test case?

Ciao,
Dscho

  reply	other threads:[~2007-06-28 13:07 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-26  4:01 [PATCH] git-merge-ff: fast-forward only merge Sam Vilain
2007-06-28 11:33 ` Matthias Lederhofer
2007-06-28 13:01   ` Johannes Schindelin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2007-06-30  8:56 a bunch of outstanding updates Sam Vilain
2007-06-30  8:56 ` [PATCH] repack: improve documentation on -a option Sam Vilain
2007-06-30  8:56   ` [PATCH] git-svn: use git-log rather than rev-list | xargs cat-file Sam Vilain
2007-06-30  8:56     ` [PATCH] git-svn: cache max revision in rev_db databases Sam Vilain
2007-06-30  8:56       ` [PATCH] GIT-VERSION-GEN: don't convert - delimiter to .'s Sam Vilain
2007-06-30  8:56         ` [PATCH] git-remote: document -n Sam Vilain
2007-06-30  8:56           ` [PATCH] git-remote: allow 'git-remote fetch' as a synonym for 'git fetch' Sam Vilain
2007-06-30  8:56             ` [PATCH] git-merge-ff: fast-forward only merge Sam Vilain
2007-06-30 14:28               ` Johannes Schindelin
2007-06-30 18:32               ` Matthias Lederhofer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0706281400530.4438@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=matled@gmx.net \
    --cc=sam.vilain@catalyst.net.nz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).