summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-09 15:25:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-09 15:25:46 -0700
commit34186225b3ca3109586fd63ee83aeea342dc668e (patch)
tree826261c151c2a760c2aebaa7a681eff170c32352 /builtin/pull.c
parentMerge branch 'sg/t5551-fetch-smart-error-is-translated' (diff)
parentstatus: ignore status.aheadbehind in porcelain formats (diff)
downloadtgif-34186225b3ca3109586fd63ee83aeea342dc668e.tar.xz
Merge branch 'jh/status-aheadbehind'
"git status" can be told a non-standard default value for the "--[no-]ahead-behind" option with a new configuration variable status.aheadBehind. * jh/status-aheadbehind: status: ignore status.aheadbehind in porcelain formats status: warn when a/b calculation takes too long status: add status.aheadbehind setting
Diffstat (limited to 'builtin/pull.c')
0 files changed, 0 insertions, 0 deletions