Dear diary, on Tue, Feb 21, 2006 at 06:10:05AM CET, I got a letter where Ben Clifford <benc@xxxxxxxxxxxxx> said that... > > As a practice for doing "even cooler merge", I did the > > following, to see if I can treat it just like I treat gitk. > > neat. > > one thing that bothers me a bit about that is that the cogito code > then ends up in both the git and cogito repositories (actually the way > its done manually for cogito contrib/ at the moment bothers me > anyway). Well, in the long term, Jonas is working on a bash completion generated automagically from the cg sources (anything maintained externally is bad 'coz it gets out of sync, mm'kay? ;). In the short term, I can just accept patches from you - they do not even need to get the filenames right, I can rewrite that. You see, I don't have the cool recursive merge strategy so merging into a subdirectory is painful (and that bothers me too; we'll see yet). Thanks, -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Of the 3 great composers Mozart tells us what it's like to be human, Beethoven tells us what it's like to be Beethoven and Bach tells us what it's like to be the universe. -- Douglas Adams - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html