| commit | 44e8cf66fb3caa8ff5ad82c2fb2f2d1b96f85bbc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Feb 2012 02:16:10 +0000 (5 18:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Feb 2012 02:16:10 +0000 (5 18:16 -0800) | ||
| tree | 54b9cb17bce72a4538a577953cb64d32ee7492c7 | treesnapshot (tar.gz zip) |
| parent | 4264ffa7b68400a8955a9228c941bbd77737ed5b | commitdiff |
| parent | 8a5b749428d39a0e85fb0f76306b88945cb5c6e0 | commitdiff |
Merge branch 'jx/i18n-more-marking' into next
* jx/i18n-more-marking:
i18n: format_tracking_info "Your branch is behind" message
i18n: git-commit whence_s "merge/cherry-pick" message
* jx/i18n-more-marking:
i18n: format_tracking_info "Your branch is behind" message
i18n: git-commit whence_s "merge/cherry-pick" message