From: Avi Kivity <avi@qumranet.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Xavier Maillard <zedek@gnu.org>,
"J. Bruce Fields" <bfields@fieldses.org>,
git@vger.kernel.org
Subject: Re: git merge and merge message
Date: Sun, 11 Mar 2007 22:31:15 +0200 [thread overview]
Message-ID: <45F46713.6030702@qumranet.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0703111309410.9690@woody.linux-foundation.org>
Linus Torvalds wrote:
> Comments? Do people think it would be a good idea to do
>
> git merge --no-fast-forward -m "Merge feature Xyz" xyz-branch
>
> as an option?
>
>
Actually there's at least one tree where this should be activated --
yours. If you perform a fast-forward merge, there's no record of the
merge, no record of which tree was pulled, and no sign-off from you.
The commits just appear there. It partially defeats the sign-off system.
This feature would be good for top-level trees and for major subsystem
trees IMO.
--
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
next prev parent reply other threads:[~2007-03-11 20:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-11 15:05 git merge and merge message Xavier Maillard
2007-03-11 16:04 ` J. Bruce Fields
2007-03-11 16:28 ` [PATCH] git-merge: warn when -m provided on a fast forward J. Bruce Fields
2007-03-11 18:15 ` git merge and merge message Xavier Maillard
2007-03-11 20:19 ` Linus Torvalds
2007-03-11 20:31 ` Avi Kivity [this message]
2007-03-11 21:05 ` Linus Torvalds
2007-03-12 17:26 ` Avi Kivity
2007-03-11 21:41 ` Johannes Schindelin
2007-03-12 2:03 ` Junio C Hamano
2007-03-12 17:31 ` Avi Kivity
2007-03-11 20:56 ` Junio C Hamano
2007-03-13 8:55 ` [RFC] git log --first-parent Junio C Hamano
2007-03-13 14:17 ` Jeff King
2007-03-12 3:07 ` git merge and merge message Martin Langhoff
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=45F46713.6030702@qumranet.com \
--to=avi@qumranet.com \
--cc=bfields@fieldses.org \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=zedek@gnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.