From: Junio C Hamano Date: Wed, 1 Feb 2012 06:24:23 +0000 (-0800) Subject: Merge branch 'ar/i18n-no-gettext' X-Git-Tag: v1.7.10-rc0~124 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa;p=git.git Merge branch 'ar/i18n-no-gettext' * ar/i18n-no-gettext: i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n add a Makefile switch to avoid gettext translation in shell scripts git-sh-i18n: restructure the logic to compute gettext.sh scheme --- 2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa