![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700) | ||
| commit | 32f05803374b80b9dc71513784d142e1dc0d7e1e | |
| tree | 5c2320cf95e07e2c3b44ec6562cca75dbe05f4c4 | tree | snapshot |
| parent | 0a99e7584bd5b8603cda5e6c02dd6c254b3770d2 | commit | diff |
| parent | 900647104e02e545064789f3c6b90a5807fba07b | commit | diff |
Merge branch 'ks/no-textconv-symlink' into next
* ks/no-textconv-symlink:
blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
* ks/no-textconv-symlink:
blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
| builtin.h | diff1 | | diff2 | | blob | history |
| builtin/blame.c | diff1 | | diff2 | | blob | history |
| sha1_name.c | diff1 | | diff2 | | blob | history |