A recent commit in linux-2.6 looks like this:
commit b129a8ccd53f74c43e4c83c8e0031a4990040830
Merge: 6b39374a27eb4be7e9d82145ae270ba02ea90dc8
194d0710e1a7fe92dcf860ddd31fded8c3103b7a
Author: Russell King <[EMAIL PROTECTED]>
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
