From: "Sverre Hvammen Johansen" <hvammen@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] Fast forward strategies allow, never, and only
Date: Sat, 15 Mar 2008 22:44:48 -0800 [thread overview]
Message-ID: <402c10cd0803152344h3fb6781fxd8e6375c8491f8a1@mail.gmail.com> (raw)
In-Reply-To: <402c10cd0803112246q4ec98018pe9a34b95e32cf1@mail.gmail.com>
On Tue, Mar 11, 2008 at 9:46 PM, Sverre Hvammen Johansen
<hvammen@gmail.com> wrote:
> To me it makes sense that a squash oweride the ff options instead
> of giving a error, but specifying a ff option after --squash is an error.
After some consideration I am convinced we should allow --squash
combined with any of the --ff options. The same for --no-commit.
--squash combined with any of the --ff options means that the index
and the tree will only be updated if a merge without --squash would
have done the same.
That mean that t7600-merge.sh will break as follows:
* FAIL 19: combining --squash and --no-ff is refused
test_must_fail git merge --squash --no-ff c1 &&
test_must_fail git merge --no-ff --squash c1
--
Sverre Hvammen Johansen
next prev parent reply other threads:[~2008-03-16 6:46 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-11 2:59 [RFC/PATCH] Fast forward strategies allow, never, and only Sverre Hvammen Johansen
2008-03-11 3:18 ` Sverre Hvammen Johansen
2008-03-11 5:17 ` Ping Yin
2008-03-11 6:19 ` Junio C Hamano
2008-03-12 5:46 ` Sverre Hvammen Johansen
2008-03-16 6:44 ` Sverre Hvammen Johansen [this message]
2008-03-14 2:35 ` Sverre Hvammen Johansen
2008-03-11 9:15 ` Jakub Narebski
2008-03-12 4:24 ` Sverre Hvammen Johansen
2008-03-12 4:50 ` Junio C Hamano
2008-03-12 5:51 ` Sverre Hvammen Johansen
2008-03-18 4:27 ` [RFC/PATCH Second draft] " Sverre Hvammen Johansen
2008-03-18 13:57 ` Ping Yin
2008-03-18 15:58 ` Sverre Hvammen Johansen
2008-03-18 14:12 ` Jon Loeliger
2008-03-18 16:27 ` Jakub Narebski
2008-03-19 6:20 ` Sverre Hvammen Johansen
2008-03-19 21:20 ` Jakub Narebski
2008-03-20 4:44 ` Sverre Hvammen Johansen
2008-03-19 20:35 ` Junio C Hamano
2008-03-20 6:47 ` Sverre Hvammen Johansen
2008-03-22 19:49 ` Junio C Hamano
2008-03-26 3:50 ` Sverre Hvammen Johansen
2008-03-31 4:19 ` Sverre Hvammen Johansen
2008-04-20 1:06 ` [PATCH] " Sverre Hvammen Johansen
2008-04-22 7:48 ` Junio C Hamano
2008-04-24 5:39 ` [PATCH 0/5] " Sverre Hvammen Johansen
2008-03-11 9:35 [RFC/PATCH] " colin
2008-03-11 10:09 ` Lars Hjemli
2008-03-11 12:24 ` Bruce Stephens
2008-03-11 12:33 ` Bruce Stephens
2008-03-12 1:57 ` Junio C Hamano
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=402c10cd0803152344h3fb6781fxd8e6375c8491f8a1@mail.gmail.com \
--to=hvammen@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).