diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:05:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:05:45 -0700 |
| commit | afc2e81247042e11d9cf981ac5671746caddc22a (patch) | |
| tree | bd55302ff9258081eeb50570b4c6dd95da838238 /t/t7600-merge.sh | |
| parent | Merge branch 'jc/nobody-sets-src-peer-ref' (diff) | |
| parent | status, branch: fix the misleading "bisecting" message (diff) | |
| download | tgif-afc2e81247042e11d9cf981ac5671746caddc22a.tar.xz | |
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()
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions