From: "Sverre Hvammen Johansen" <hvammen@gmail.com>
To: git@vger.kernel.org
Subject: Re: Merging using only fast-forward
Date: Wed, 16 Jan 2008 14:38:20 -0800 [thread overview]
Message-ID: <402c10cd0801161438u7443ebf2xdf1d6f3040ceb1a9@mail.gmail.com> (raw)
In-Reply-To: <7vwsq9o6ls.fsf@gitster.siamese.dyndns.org>
On Jan 16, 2008 12:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
> A sane integration is a different story.
>
> We have --ff and --no-ff options to merge. How should this new
> option --ff-only mesh with them? Perhaps we would want to have
> an option --ff that takes three values?
>
> --ff=never
> --ff=normal
> --ff=only
>
> and have the first one be synonym for existing --no-ff, the second
> one to be a synonym for not giving anything (or giving --ff
> explicitly), and the third one to be this new mode of operation?
Thanks for the patch. I can probably look into it tonight and do the
suggested integration and test it out, I keep you posted.
--
Sverre Hvammen Johansen
next prev parent reply other threads:[~2008-01-16 22:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-16 15:54 Merging using only fast-forward Sverre Hvammen Johansen
2008-01-16 16:27 ` Randal L. Schwartz
2008-01-16 20:31 ` Junio C Hamano
2008-01-16 22:38 ` Sverre Hvammen Johansen [this message]
2008-01-16 22:49 ` Junio C Hamano
2008-01-17 6:53 ` Sverre Hvammen Johansen
2008-01-18 6:58 ` Sverre Hvammen Johansen
2008-01-18 21:25 ` Junio C Hamano
2008-01-19 10:28 ` Sverre Hvammen Johansen
2008-01-19 10:38 ` Sverre Hvammen Johansen
2008-01-19 10:43 ` Junio C Hamano
[not found] ` <402c10cd0801190427o62493073s408959aa5701ca86@mail.gmail.com>
2008-01-19 12:30 ` Sverre Hvammen Johansen
2008-01-19 12:58 ` Please don't reply to this thread Sverre Hvammen Johansen
2008-01-19 12:39 ` Merging using only fast-forward Sverre Hvammen Johansen
2008-01-21 6:26 ` Sverre Hvammen Johansen
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=402c10cd0801161438u7443ebf2xdf1d6f3040ceb1a9@mail.gmail.com \
--to=hvammen@gmail.com \
--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).