Merge branch 'mg/status-b' into next
commitd1e3f9e7fa2eb9031e0e42c1b137c8f43428d02a
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jun 2010 05:15:45 +0000 (7 22:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jun 2010 05:15:45 +0000 (7 22:15 -0700)
tree8125c5a2a135e585c820a5bbba3f11510813da02
parent1796035bb9f508299d19e1185ee943fe6296f330
parent46077fa5d477a3e96e0bb96042a2a9fdc9c818cb
Merge branch 'mg/status-b' into next

* mg/status-b:
  Documentation+t5708: document and test status -s -b
  Show branch information in short output of git status

Conflicts:
wt-status.h
builtin/commit.c
wt-status.c
wt-status.h