![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Mar 2009 07:26:47 +0000 (00:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Mar 2009 07:26:47 +0000 (00:26 -0700) | ||
| commit | 23fd723c9dfbe9b558c0d9a46696ca93f93bab04 | |
| tree | 93a6e9ad79fb71d08ddf7b609d25d7c697dc5c46 | tree | snapshot |
| parent | 2545c089e329d340a9bdec9f725fa737063dd7f6 | commit | diff |
| parent | 76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 | commit | diff |
Merge branch 'bc/maint-1.6.1-branch-deleted-was'
* bc/maint-1.6.1-branch-deleted-was:
git-branch: display "was sha1" on branch deletion rather than just "sha1"
Conflicts:
builtin-branch.c
* bc/maint-1.6.1-branch-deleted-was:
git-branch: display "was sha1" on branch deletion rather than just "sha1"
Conflicts:
builtin-branch.c
| builtin-branch.c | diff1 | | diff2 | | blob | history |
| t/t3200-branch.sh | diff1 | | diff2 | | blob | history |