Merge branch 'nd/branch-show-rebase-bisect-state'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:05:45 +0000 (09:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:05:45 +0000 (09:05 -0700)
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()

1  2 
builtin/branch.c
t/t7406-submodule-update.sh
t/t7512-status-help.sh
wt-status.c
wt-status.h
Simple merge
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge
diff --cc wt-status.h
Simple merge