On Sun, Oct 25, 2009 at 10:15 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > I'll queue your patch with the following interdiff for now. > > * user-manual.txt: do not change emphasis (typography) in this patch---if > it needs to be changed, that should be a separate patch. > > * builtin-fetch.c: an instance of "non fast-forward" was left > unconverted; fix it. > > * contrib/hooks/post-receive-email: likewise. > > By the way, in Documentation/git-init.txt there also is another "non > fast-forward"; since it is not a fix-up to this patch, I left it as-is. > We may want to change it as well while we are at it. > > * git-gui: this is a straight revert of your patch, so that Shawn can > apply an undated version of this patch to his tree first, and then I > can pull the result from him. > > $ git grep -i -n -e 'fast forward' -- git-gui/ > > will show what need to be changed. This is a key string of "mc", so > msgid in *.po files and git-gui.pot file need to consistently change, > even though the translated strings in *.po files may stay as before. > > If you spot misconversions in here (or other "fast forward" that need to be > converted but I missed), please holler. It's fine by me :) -- Felipe Contreras -- To unsubscribe from this list: 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