summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:26:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:26:57 -0700
commit2e6e3e82ee36b3e1bec1db8db24817270080424e (patch)
treed2fd031f798ec11b95c04c0c8ec48426f3c420cd /builtin/merge.c
parentMerge branch 'nd/fetch-into-shallow' (diff)
parentstatus: always show tracking branch even no change (diff)
downloadtgif-2e6e3e82ee36b3e1bec1db8db24817270080424e.tar.xz
Merge branch 'jx/branch-vv-always-compare-with-upstream'
"git branch -v -v" (and "git status") did not distinguish among a branch that does not build on any other branch, a branch that is in sync with the branch it builds on, and a branch that is configured to build on some other branch that no longer exists. * jx/branch-vv-always-compare-with-upstream: status: always show tracking branch even no change branch: report invalid tracking branch as gone
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions