Merge branch 'nd/status-show-in-progress'
commit55f9c8351d8bf0aca18cb3472ec081ad57c96543
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:54 +0000 (14 10:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2013 18:29:54 +0000 (14 10:29 -0800)
treeb5d6cc3df06eadd220e16e41cbd35bdaee2ca11d
parent97a8f025e5d9e582c38864e0c2e3e8006856cfba
parent0722c805d616eb644a868a995b891470f9e5e30d
Merge branch 'nd/status-show-in-progress'

* nd/status-show-in-progress:
  status: show the branch name if possible in in-progress info
wt-status.c