Re: ominous git commit

[Kyle McMartin]

On Sat, Oct 29, 2005 at 12:24:27AM +0200, Tim Schmielau wrote:
> It's commit message says: 'Auto-update from upstream', and it indeed seems 
> to contain changes already made to the upstream tree. Would someone please 
> explain to me why it shows up in Linus' tree?
>

If you look around the shortlog, you'll see I'm not the only person[1] with
these messages. I suspect mine was large because I pulled my linus branch
into my parisc branch, rather than vice versa. Linus explained to me that
these merge markers get created whenever a non-trivial merge occurs.
Not something to worry about, I believe. 

Cheers,
	Kyle

1: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/