summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-17 11:46:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-17 11:46:57 -0800
commit77933f4449b8d6aa7529d627f3c7b55336f491db (patch)
tree91ce62aba00c10c6f2f4346f404f64dec00b5c3a /xdiff
parentMerge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff)
parentGit 2.1.4 (diff)
downloadtgif-77933f4449b8d6aa7529d627f3c7b55336f491db.tar.xz
Sync with v2.1.4
* maint-2.1: Git 2.1.4 Git 2.0.5 Git 1.9.5 Git 1.8.5.6 fsck: complain about NTFS ".git" aliases in trees read-cache: optionally disallow NTFS .git variants path: add is_ntfs_dotgit() helper fsck: complain about HFS+ ".git" aliases in trees read-cache: optionally disallow HFS+ .git variants utf8: add is_hfs_dotgit() helper fsck: notice .git case-insensitively t1450: refactor ".", "..", and ".git" fsck tests verify_dotfile(): reject .git case-insensitively read-tree: add tests for confusing paths like ".." and ".git" unpack-trees: propagate errors adding entries to the index
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions