From: Sam Vilain <sam@vilain•net>
To: Lars Hjemli <hjemli@gmail•com>
Cc: Junio C Hamano <gitster@pobox•com>,
Eric Wong <normalperson@yhbt•net>, Andreas Ericsson <ae@op5•se>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Chris Shoemaker <c.shoemaker@cox•net>,
git@vger•kernel.org
Subject: Re: [PATCH] git-merge: add option --no-ff
Date: Tue, 18 Sep 2007 23:50:50 +1200 [thread overview]
Message-ID: <46EFBB9A.5070404@vilain.net> (raw)
In-Reply-To: <8c5c35580709180419i4500a2d4s8a997d45dd31944e@mail.gmail.com>
Lars Hjemli wrote:
> On 9/18/07, Sam Vilain <sam@vilain•net> wrote:
>
>> I think that writing a real fast-forward merge should only happen on
>> dcommit, not git merge, because that is what is required for SVN.
>>
>
> I don't think git-svn has any way of knowing that the user wanted a
> merge, unless a merge commit is present. So the user would have to
> specify the set of commits which should be considered a merge during
> dcommit (this would actually resemble how merges are performed in
> subversion).
>
Sure it can. If you're committing to branch X, and the current tree has
a whole lot of commits above that, then it should do the only thing you
can do with SVN.
Which is write a squash commit, and set the "svn:merge" and/or
"svk:merge" properties to represent what happened.
> Sidenote: this might be slightly controversial, but I've sometimes
> missed a --no-ff option to 'git merge' when working on plain git
> repositories; IMHO preserving the 'logical' merge history when the
> merge of a topic branch results in a fast-forward can be interesting.
If you really want one, use git commit-tree directly.
Sam.
next prev parent reply other threads:[~2007-09-18 11:50 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 12:17 [PATCH] git-merge: add option --no-ff Lars Hjemli
2007-09-17 12:39 ` Andreas Ericsson
2007-09-17 13:16 ` Lars Hjemli
2007-09-17 13:23 ` Johannes Schindelin
2007-09-17 13:37 ` Chris Shoemaker
2007-09-17 13:40 ` Lars Hjemli
2007-09-17 13:52 ` Johannes Schindelin
2007-09-17 13:38 ` Lars Hjemli
2007-09-17 13:57 ` Johannes Schindelin
2007-09-17 14:12 ` Lars Hjemli
2007-09-17 15:05 ` Johannes Schindelin
2007-09-17 15:17 ` Lars Hjemli
2007-09-17 16:23 ` Lars Hjemli
2007-09-18 0:50 ` Eric Wong
2007-09-18 1:09 ` Junio C Hamano
2007-09-18 1:39 ` Eric Wong
2007-09-18 6:12 ` Lars Hjemli
2007-09-18 6:23 ` Eric Wong
2007-09-18 6:53 ` Junio C Hamano
2007-09-18 7:30 ` Sam Vilain
2007-09-18 9:12 ` Sam Vilain
2007-09-18 11:19 ` Lars Hjemli
2007-09-18 11:50 ` Sam Vilain [this message]
2007-09-18 12:03 ` Lars Hjemli
2007-09-18 13:22 ` Sam Vilain
2007-09-18 14:01 ` Lars Hjemli
2007-09-18 14:34 ` Sam Vilain
2007-09-18 12:29 ` Johannes Schindelin
2007-09-18 12:38 ` Lars Hjemli
2007-09-18 8:02 ` Lars Hjemli
2007-09-18 22:51 ` Peter Baumann
2007-09-19 7:09 ` Lars Hjemli
2007-09-17 16:07 ` Chris Shoemaker
2007-09-17 16:14 ` Lars Hjemli
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=46EFBB9A.5070404@vilain.net \
--to=sam@vilain$(echo .)net \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=ae@op5$(echo .)se \
--cc=c.shoemaker@cox$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=hjemli@gmail$(echo .)com \
--cc=normalperson@yhbt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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