summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Jeff Hostetler <jeffhost@microsoft.com>2018-01-09 18:50:18 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-24 13:48:39 -0800
commitf39a757dd93488103dde76e992a75edf2d772b62 (patch)
treed27d738996d848c0d0e2bababaf4435040fc34f0 /builtin/merge-file.c
parentstatus: update short status to respect --no-ahead-behind (diff)
downloadtgif-f39a757dd93488103dde76e992a75edf2d772b62.tar.xz
status: support --no-ahead-behind in long format
Teach long (normal) status format to respect the --no-ahead-behind parameter and skip the possibly expensive ahead/behind computation between the branch and the upstream. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions