![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Apr 2010 19:40:45 +0000 (12:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Apr 2010 19:40:45 +0000 (12:40 -0700) | ||
| commit | f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7 | |
| tree | 91956e5a6a412502376f1d54009c9d23e213074a | tree | snapshot |
| parent | f02dd06e26ed9f6f6f265791cfc7bfb48babf3b5 | commit | diff |
| parent | 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 | commit | diff |
Merge branch 'maint'
* maint:
t1010-mktree: Adjust expected result to code and documentation
combined diff: correctly handle truncated file
Document new "already-merged" rule for branch -d
* maint:
t1010-mktree: Adjust expected result to code and documentation
combined diff: correctly handle truncated file
Document new "already-merged" rule for branch -d
| Documentation/git-branch.txt | diff1 | | diff2 | | blob | history |