diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:24 -0800 |
| commit | 9f6774ed86a9ac22142c0b37e26e67eb1d032962 (patch) | |
| tree | 421e3ac59adf3683a03e954ebf5f2998bd34886a /builtin/rerere.c | |
| parent | f3a70e9cc6d31e3cb8158f64be13c594226bf03f (diff) | |
| parent | 900647104e02e545064789f3c6b90a5807fba07b (diff) | |
| download | git-9f6774ed86a9ac22142c0b37e26e67eb1d032962.tar.gz | |
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
Diffstat (limited to 'builtin/rerere.c')
0 files changed, 0 insertions, 0 deletions