diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:42 -0700 |
commit | 1e239079f704b840778c263f35f1e299565d4a49 (patch) | |
tree | e97798c2f77f567f308317f61444cdc69ef6a393 /cache.h | |
parent | 32b31ab7f3ff52eafc40033b890b313efaed8c56 (diff) | |
parent | 92a684b916edf9e0f4f7962865e62ff71a988445 (diff) | |
download | git-1e239079f704b840778c263f35f1e299565d4a49.tar.gz git-1e239079f704b840778c263f35f1e299565d4a49.tar.xz |
Merge branch 'ab/i18n-basic'
* ab/i18n-basic:
i18n: "make distclean" should clean up after "make pot"
i18n: Makefile: "pot" target to extract messages marked for translation
i18n: add stub Q_() wrapper for ngettext
i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
i18n: add GETTEXT_POISON to simulate unfriendly translator
i18n: add no-op _() and N_() wrappers
commit, status: use status_printf{,_ln,_more} helpers
commit: refer to commit template as s->fp
wt-status: add helpers for printing wt-status lines
Conflicts:
builtin/commit.c
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5,6 +5,7 @@ #include "strbuf.h" #include "hash.h" #include "advice.h" +#include "gettext.h" #include SHA1_HEADER #ifndef git_SHA_CTX |