aboutsummaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-28 13:41:49 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-28 13:41:50 +0900
commit3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3 (patch)
tree31a86627d257322a94ef0e3977fb5b89b18477c6 /builtin/branch.c
parent16169285f1e63f6a3d9ec10e48f55d6825d3156b (diff)
parent0ae19de74f6f5d6c6f9c80899e1ecd611c5b9827 (diff)
downloadgit-3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3.tar.gz
git-3b49e1b0e900a88cab9e1b035dac83c0dd6ae2b3.tar.xz
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 'builtin/branch.c')
-rw-r--r--builtin/branch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 5fc57cdc9..af95ad219 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -675,6 +675,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
copy *= 2;
}
+ if (list)
+ setup_auto_pager("branch", 1);
+
if (delete) {
if (!argc)
die(_("branch name required"));