summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-21 04:02:15 -0700
commitaf655431f53c20e3d0ed236544397c69974267f4 (patch)
treeddfc95bd3f768e98709cc2d7a445e64117d4c784 /.gitignore
parentMerge branch 'ld/discovery-limit-to-fs' (early part) (diff)
parentt5800: testgit helper requires Python support (diff)
downloadtgif-af655431f53c20e3d0ed236544397c69974267f4.tar.xz
Merge branch 'sr/remote-helper-export'
* sr/remote-helper-export: t5800: testgit helper requires Python support Makefile: Simplify handling of python scripts remote-helpers: add tests for testgit helper remote-helpers: add testgit helper remote-helpers: add support for an export command remote-helpers: allow requesing the path to the .git directory fast-import: always create marks_file directories clone: also configure url for bare clones clone: pass the remote name to remote_get Conflicts: Makefile
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index dbf1b90c63..14e2b6bde9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,7 @@
/git-remote-https
/git-remote-ftp
/git-remote-ftps
+/git-remote-testgit
/git-repack
/git-replace
/git-repo-config