From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.pouillard@gmail.com (Nicolas Pouillard) Date: Wed, 16 Jan 2008 09:51:54 +0100 Subject: [sup-talk] the proper way of determining the encoding In-Reply-To: <1200452938-sup-9442@south> References: <1199569265-sup-4567@clarabella.clarabella> <1199685831-sup-2011@south> <1199695733-sup-2741@clarabella.clarabella> <1199901555-sup-2661@south> <1199925510-sup-7503@clarabella.clarabella> <1200190710-sup-6881@south> <1200414495-sup-4477@spooky.local> <1200447310-sup-8536@south> <1200449354-sup-9441@ausone.local> <1200452148-sup-9276@south> <1200452938-sup-9442@south> Message-ID: <1200473352-sup-5980@ausone.local> Excerpts from William Morgan's message of Wed Jan 16 04:09:48 +0100 2008: > Reformatted excerpts from William Morgan's message of 2008-01-15: > > Reformatted excerpts from nicolas.pouillard's message of 2008-01-15: > > > And I don't see your gettext patch neither on master nor on next ;( > > > > Whoops, I had never merged it onto next in the first place. Well, it's > > on master now. Let me know if it gives you any trouble. > > Aaaand merged onto next. I do seem to spend a lot of my time merging > from master to next. I wonder if that's proper git usage. Seems to > clutter up my pretty gitk graph. I don't know the proper git usage, but I think that you should make all you commits on next, apply all patches from users on next, and then cherry-pick changes from next to master when they are well tested. -- Nicolas Pouillard aka Ertai