summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-28 04:41:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-28 04:41:50 (GMT)
commit3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3 (patch)
tree31a86627d257322a94ef0e3977fb5b89b18477c6 /git.c
parent16169285f1e63f6a3d9ec10e48f55d6825d3156b (diff)
parent0ae19de74f6f5d6c6f9c80899e1ecd611c5b9827 (diff)
downloadgit-3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3.zip
git-3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3.tar.gz
git-3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3.tar.bz2
Merge branch 'ma/branch-list-paginate'
"git branch --list" learned to show its output through the pager by default when the output is going to a terminal, which is controlled by the pager.branch configuration variable. This is similar to a recent change to "git tag --list". * ma/branch-list-paginate: branch: change default of `pager.branch` to "on" branch: respect `pager.branch` in list-mode only t7006: add tests for how git branch paginates
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 9e96dd4..c870b97 100644
--- a/git.c
+++ b/git.c
@@ -372,7 +372,7 @@ static struct cmd_struct commands[] = {
{ "archive", cmd_archive, RUN_SETUP_GENTLY },
{ "bisect--helper", cmd_bisect__helper, RUN_SETUP },
{ "blame", cmd_blame, RUN_SETUP },
- { "branch", cmd_branch, RUN_SETUP },
+ { "branch", cmd_branch, RUN_SETUP | DELAY_PAGER_CONFIG },
{ "bundle", cmd_bundle, RUN_SETUP_GENTLY },
{ "cat-file", cmd_cat_file, RUN_SETUP },
{ "check-attr", cmd_check_attr, RUN_SETUP },