summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-05-26 02:12:14 -0500
committerJonathan Nieder <jrnieder@gmail.com>2011-05-26 02:12:14 -0500
commitc19d653c4fcdc93169507c09f8f66ebffbdbb9a5 (patch)
treea35ddef2950330a0ac88f0c467080ea32e751831 /.gitignore
parent9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e (diff)
parentcba3546a43c64e2078664dbb6469aadf6bc473d3 (diff)
downloadgit-c19d653c4fcdc93169507c09f8f66ebffbdbb9a5.tar.gz
Merge branch 'db/svn-fe-code-purge' into svn-fe
* db/svn-fe-code-purge: vcs-svn: drop obj_pool vcs-svn: drop treap vcs-svn: drop string_pool vcs-svn: pass paths through to fast-import Conflicts: vcs-svn/fast_export.c vcs-svn/fast_export.h vcs-svn/repo_tree.c vcs-svn/repo_tree.h vcs-svn/string_pool.c vcs-svn/svndump.c vcs-svn/trp.txt
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 2cf3ca5808..fa0c763774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -169,16 +169,13 @@
/test-line-buffer
/test-match-trees
/test-mktemp
-/test-obj-pool
/test-parse-options
/test-path-utils
/test-run-command
/test-sha1
/test-sigchain
-/test-string-pool
/test-subprocess
/test-svn-fe
-/test-treap
/common-cmds.h
*.tar.gz
*.dsc