From: Wayne Scott <wsc9tt@gmail.com>
To: git@vger.kernel.org
Subject: bogus merges
Date: Mon, 5 Sep 2005 09:38:29 -0500 [thread overview]
Message-ID: <59a6e58305090507387d412b3d@mail.gmail.com> (raw)
A recent commit in linux-2.6 looks like this:
commit b129a8ccd53f74c43e4c83c8e0031a4990040830
Merge: 6b39374a27eb4be7e9d82145ae270ba02ea90dc8
194d0710e1a7fe92dcf860ddd31fded8c3103b7a
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed Aug 31 10:12:14 2005 +0100
[SERIAL] Clean up and fix tty transmission start/stoping
The problem is that two parents of this merge are separate. One is an
ancestor of the other. This means the merge is really pointless and
probably accidental.
Really 'git commit' should detect problems like this automatically and
prevent them from getting in the tree.
-Wayne
next reply other threads:[~2005-09-05 14:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 14:38 Wayne Scott [this message]
2005-09-05 16:01 ` bogus merges Linus Torvalds
2005-09-06 13:08 ` Wayne Scott
2005-09-11 11:06 ` Russell King
2005-09-06 18:28 ` Daniel Barkalow
2005-09-11 11:01 ` Russell King
2005-09-11 18:08 ` Daniel Barkalow
2005-09-12 0:58 ` Petr Baudis
2005-09-11 10:21 ` Russell King
2005-09-11 11:48 ` Martin Langhoff
2005-09-11 15:11 ` A Large Angry SCM
2005-09-11 18:36 ` Russell King
2005-09-11 18:00 ` Russell King
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=59a6e58305090507387d412b3d@mail.gmail.com \
--to=wsc9tt@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).