diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-26 16:42:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-26 16:42:59 -0700 |
| commit | 515cc0101943b766fde7aa894827119e332ec033 (patch) | |
| tree | 29fb328e0ef904cf78c2c06a0fbc49e0e484dbae /git.c | |
| parent | b5442ca101c2d2b6eacaf3428505e5006f2218ae (diff) | |
| parent | ea16a030aaaaebb3d0038e3ec2d9cd837985dee0 (diff) | |
| download | git-515cc0101943b766fde7aa894827119e332ec033.tar.gz git-515cc0101943b766fde7aa894827119e332ec033.tar.xz | |
Merge branch 'maint'
* maint:
for-each-ref: fix objectname:short bug
tree-walk: Correct bitrotted comment about tree_entry()
Fix 'git log' early pager startup error case
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -337,7 +337,7 @@ static void handle_internal_command(int argc, const char **argv) { "index-pack", cmd_index_pack }, { "init", cmd_init_db }, { "init-db", cmd_init_db }, - { "log", cmd_log, RUN_SETUP | USE_PAGER }, + { "log", cmd_log, RUN_SETUP }, { "ls-files", cmd_ls_files, RUN_SETUP }, { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "ls-remote", cmd_ls_remote }, @@ -381,7 +381,7 @@ static void handle_internal_command(int argc, const char **argv) { "send-pack", cmd_send_pack, RUN_SETUP }, { "shortlog", cmd_shortlog, USE_PAGER }, { "show-branch", cmd_show_branch, RUN_SETUP }, - { "show", cmd_show, RUN_SETUP | USE_PAGER }, + { "show", cmd_show, RUN_SETUP }, { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE }, { "stripspace", cmd_stripspace }, { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP }, @@ -396,7 +396,7 @@ static void handle_internal_command(int argc, const char **argv) { "var", cmd_var }, { "verify-tag", cmd_verify_tag, RUN_SETUP }, { "version", cmd_version }, - { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER }, + { "whatchanged", cmd_whatchanged, RUN_SETUP }, { "write-tree", cmd_write_tree, RUN_SETUP }, { "verify-pack", cmd_verify_pack }, { "show-ref", cmd_show_ref, RUN_SETUP }, |