![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Mar 2009 23:41:35 +0000 (15:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Mar 2009 23:41:35 +0000 (15:41 -0800) | ||
| commit | 814742672f765e379f7809eab7650e8ad0a24c35 | |
| tree | 0b39f14aa6deeb6a35a3effced48faaefb3813ef | tree | snapshot |
| parent | 4a2caf691232ef9599ee3f1a1a04a47f309e65c1 | commit | diff |
| parent | 0afc304406196e4470fd2a628c3733e966068d98 | commit | diff |
Merge branch 'js/branch-symref'
* js/branch-symref:
add basic branch display tests
branch: clean up repeated strlen
Avoid segfault with 'git branch' when the HEAD is detached
builtin-branch: improve output when displaying remote branches
Conflicts:
builtin-branch.c
* js/branch-symref:
add basic branch display tests
branch: clean up repeated strlen
Avoid segfault with 'git branch' when the HEAD is detached
builtin-branch: improve output when displaying remote branches
Conflicts:
builtin-branch.c
| builtin-branch.c | diff1 | | diff2 | | blob | history |