diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:09:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:09:14 -0700 |
| commit | 53b304224a561b5fd4ae35cedc0a978d91d4b1da (patch) | |
| tree | 0d83b638b05e36452d1a49623a57908dbdf3bb78 /git-gui/po/glossary/zh_cn.po | |
| parent | Merge branch 'wp/merge-tree-fix' (diff) | |
| parent | git --paginate: paginate external commands again (diff) | |
| download | tgif-53b304224a561b5fd4ae35cedc0a978d91d4b1da.tar.xz | |
Merge branch 'jn/paginate-fix'
* jn/paginate-fix:
git --paginate: paginate external commands again
git --paginate: do not commit pager choice too early
tests: local config file should be honored from subdirs of toplevel
t7006: test pager configuration for several git commands
t7006 (pager): introduce helper for parameterized tests
Conflicts:
t/t7006-pager.sh
Diffstat (limited to 'git-gui/po/glossary/zh_cn.po')
0 files changed, 0 insertions, 0 deletions