diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-23 09:58:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-23 09:58:45 -0700 |
| commit | 91810abc2fff38bed60028ae5bab9ffb2f11ef3d (patch) | |
| tree | 6aacfde9be9b04693d67a95f21854497a766c953 /builtin/merge.c | |
| parent | Merge branch 'jc/magic-pathspec' (diff) | |
| parent | Makefile: add xgettext target for *.sh files (diff) | |
| download | tgif-91810abc2fff38bed60028ae5bab9ffb2f11ef3d.tar.xz | |
Merge branch 'ab/i18n-scripts-basic'
* ab/i18n-scripts-basic:
Makefile: add xgettext target for *.sh files
git-sh-i18n.sh: add GIT_GETTEXT_POISON support
git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers
git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions