| commit | 9f6774ed86a9ac22142c0b37e26e67eb1d032962 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 19:26:24 +0000 (2 11:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 19:26:24 +0000 (2 11:26 -0800) | ||
| tree | 421e3ac59adf3683a03e954ebf5f2998bd34886a | treesnapshot (tar.gz zip) |
| parent | f3a70e9cc6d31e3cb8158f64be13c594226bf03f | commitdiff |
| parent | 900647104e02e545064789f3c6b90a5807fba07b | commitdiff |
Merge branch 'ks/no-textconv-symlink' into maint
* 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 | blobhistory |
| builtin/blame.c | diff1 | diff2 | blobhistory |
| sha1_name.c | diff1 | diff2 | blobhistory |