]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42a038c d391c0f)
Merge branch 'jk/no-textconv-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:20 +0000 (12:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:20 +0000 (12:46 -0800)
* jk/no-textconv-symlink:
  diff: don't use pathname-based diff drivers for symlinks

1  2 
diff.c patch | diff1 | diff2 | blob | history
t/t4011-diff-symlink.sh patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
diff --cc t/t4011-diff-symlink.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.