Merge branch 'jx/branch-vv-always-compare-with-upstream'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2013 19:26:57 +0000 (12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2013 19:26:57 +0000 (12:26 -0700)
"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

1  2 
builtin/branch.c
remote.c
wt-status.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc wt-status.c
Simple merge