![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Apr 2009 19:02:18 +0000 (12:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Apr 2009 19:02:18 +0000 (12:02 -0700) | ||
| commit | 8afd3178437eef29a08ba21aceb47a94177409d5 | |
| tree | 533fedcb0e579f28157dd12340fe9f962b506921 | tree | snapshot |
| parent | b5a18787bd5c757b49a7ea4fdd73e62a1fee35de | commit | diff |
| parent | 76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 | commit | diff |
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint
* 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 |