Re: bogus merges

2005-09-06 Thread Wayne Scott
On 9/5/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > Really 'git commit' should detect problems like this automatically and > > prevent them from getting in the tree. > > Well, that would depend on having the fixed git-merge-base in the first > place, which in turn would mean that such a commi

bogus merges

2005-09-05 Thread Wayne Scott
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

Re: [RFC] extending git-ls-files --exclude.

2005-08-01 Thread Wayne Scott
On 7/29/05, Junio C Hamano <[EMAIL PROTECTED]> wrote: > While I would in principle prefer to offer more freedom to shoot > yourselves in the foot ;-), the pragmatic side of me says too > much flexibility is just asking for trouble with not much > additional gain. For an example of just how far y