From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Apr 2013 16:05:45 +0000 (-0700)
Subject: Merge branch 'nd/branch-show-rebase-bisect-state'
X-Git-Tag: v1.8.3-rc0~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afc2e81247042e11d9cf981ac5671746caddc22a;p=thirdparty%2Fgit.git

Merge branch 'nd/branch-show-rebase-bisect-state'

Add a bit more information to "git status" during a rebase/bisect
session.

* nd/branch-show-rebase-bisect-state:
  status, branch: fix the misleading "bisecting" message
  branch: show more information when HEAD is detached
  status: show more info than "currently not on any branch"
  wt-status: move wt_status_get_state() out to wt_status_print()
  wt-status: split wt_status_state parsing function out
  wt-status: move strbuf into read_and_strip_branch()
---

afc2e81247042e11d9cf981ac5671746caddc22a