summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-07 02:17:23 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-07 02:17:23 -0700
commit17d778e710f9dacc770b5790e792b85cdba75a9d (patch)
tree1a3a97aa0c6d5cd86505e12ab2fc58e4f5bf849f /.gitignore
parent5e97f464df082d8f45e163bbf24341dceeafe89d (diff)
parent450f437fb0fe276a6e946c281c768118e39dc9e7 (diff)
downloadgit-17d778e710f9dacc770b5790e792b85cdba75a9d.tar.gz
Merge branch 'dr/ceiling'
* dr/ceiling: Eliminate an unnecessary chdir("..") Add support for GIT_CEILING_DIRECTORIES Fold test-absolute-path into test-path-utils Implement normalize_absolute_path Conflicts: cache.h setup.c
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 8054d9ddb8..a213e8e25b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,7 +141,6 @@ git-write-tree
git-core-*/?*
gitk-wish
gitweb/gitweb.cgi
-test-absolute-path
test-chmtime
test-date
test-delta
@@ -149,6 +148,7 @@ test-dump-cache-tree
test-genrandom
test-match-trees
test-parse-options
+test-path-utils
test-sha1
common-cmds.h
*.tar.gz