![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 Jan 2010 00:08:19 +0000 (16:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 Jan 2010 00:08:19 +0000 (16:08 -0800) | ||
| commit | 630724ca79b1a7893a8d9c04367eae857ff1a7b0 | |
| tree | b1eb1c999bf904e164a0f48e1621ee74c981514d | tree | snapshot |
| parent | 78bc024ab075f4d5d9cc0b6540b538f3d93d04cb | commit | diff |
| parent | 99c419c91554e9f60940228006b7d39d42704da7 | commit | diff |
Merge branch 'jc/branch-d'
* jc/branch-d:
branch -d: base the "already-merged" safety on the branch it merges with
* jc/branch-d:
branch -d: base the "already-merged" safety on the branch it merges with
| builtin-branch.c | diff1 | | diff2 | | blob | history |