Merge branch 'jx/i18n-more-marking' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 21:59:53 +0000 (13:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 21:59:53 +0000 (13:59 -0800)
commite6d88ca87cbb3d89d639a3ee769486f44f9a33b8
tree0aebf2fcb42700fbc813819ec219afd4994201ed
parent68e4b552a1b82343bcefa5d68fa344314b150cc8
parent8a5b749428d39a0e85fb0f76306b88945cb5c6e0
Merge branch 'jx/i18n-more-marking' into maint

* jx/i18n-more-marking:
  i18n: format_tracking_info "Your branch is behind" message
  i18n: git-commit whence_s "merge/cherry-pick" message
builtin/commit.c