summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-13 14:02:02 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-13 14:02:02 -0700
commit7783eb2e59684492e75068443e1f77f64fe37cc9 (patch)
tree28abef68309c3b2cfcb3398955eb3e2d63da5479 /.gitignore
parent721f5bb8968ed6a6ec126fe28f679c17a6998e87 (diff)
parentdf0b6cfbda88144714541664fb501146d6465a82 (diff)
downloadgit-7783eb2e59684492e75068443e1f77f64fe37cc9.tar.gz
Merge branch 'nd/multiple-work-trees'
"git checkout [<tree-ish>] <paths>" spent unnecessary cycles checking if the current branch was checked out elsewhere, when we know we are not switching the branches ourselves. * nd/multiple-work-trees: worktree: new place for "git prune --worktrees" checkout: don't check worktrees when not necessary
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 422c5382c1..a685ec1fb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,6 +171,7 @@
/git-verify-tag
/git-web--browse
/git-whatchanged
+/git-worktree
/git-write-tree
/git-core-*/?*
/gitweb/GITWEB-BUILD-OPTIONS