diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-07-13 14:02:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-07-13 14:02:02 -0700 |
commit | 7783eb2e59684492e75068443e1f77f64fe37cc9 (patch) | |
tree | 28abef68309c3b2cfcb3398955eb3e2d63da5479 /git.c | |
parent | 721f5bb8968ed6a6ec126fe28f679c17a6998e87 (diff) | |
parent | df0b6cfbda88144714541664fb501146d6465a82 (diff) | |
download | git-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 'git.c')
-rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -483,6 +483,7 @@ static struct cmd_struct commands[] = { { "verify-tag", cmd_verify_tag, RUN_SETUP }, { "version", cmd_version }, { "whatchanged", cmd_whatchanged, RUN_SETUP }, + { "worktree", cmd_worktree, RUN_SETUP }, { "write-tree", cmd_write_tree, RUN_SETUP }, }; |