| commit | afc2e81247042e11d9cf981ac5671746caddc22a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Apr 2013 16:05:45 +0000 (1 09:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Apr 2013 16:05:45 +0000 (1 09:05 -0700) | ||
| tree | bd55302ff9258081eeb50570b4c6dd95da838238 | treesnapshot (tar.gz zip) |
| parent | 6d37c162bb5b9cb4453e43d4488e953fe65cc67e | commitdiff |
| parent | 6deab24d8832e3cb2f554b827af521b094a2b32d | commitdiff |
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()
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()