git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yuval Kogman <nothingmuch@woobling.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add --ff-only flag to git-merge
Date: Wed, 28 Jan 2009 15:29:23 +0200	[thread overview]
Message-ID: <a891e1bd0901280529v296914bdod8f33a1db4846c47@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0901281425180.3586@pacific.mpi-cbg.de>

2009/1/28 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> If you compare the two if() lines, you will see that you mixed style.

Thanks,

I will be fixing it here:

http://github.com/nothingmuch/git/tree/ff-only

before I send a new version, as I likely screwed up many things, not
just that =)

  reply	other threads:[~2009-01-28 13:31 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-28 12:53 [PATCH] Add --ff-only flag to git-merge Yuval Kogman
2009-01-28 13:26 ` Johannes Schindelin
2009-01-28 13:29   ` Yuval Kogman [this message]
2009-01-28 14:35 ` Sverre Rabbelier
2009-01-28 21:12 ` Junio C Hamano
2009-01-29 20:57   ` Yuval Kogman
2009-01-29 22:29     ` Junio C Hamano
2009-01-30  4:32       ` [PATCH] Add --ff-only flag to git-merge (take 2) Yuval Kogman
2009-01-30  4:32         ` [PATCH] Add --ff-only flag to git-merge Yuval Kogman

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=a891e1bd0901280529v296914bdod8f33a1db4846c47@mail.gmail.com \
    --to=nothingmuch@woobling.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /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).