OSDN Git Service

Merge branch 'nd/worktree-lock'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:41 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:42 +0000 (10:34 -0700)
commit2c608e0f7c1f0fb9fb3e42eb737d7b8543e11400
tree2cec172b7ded4719fa38dc4df8ab5183ecea12af
parentd0b6966e3dc0a1aca8b7aa89dd0f95cda50d21f2
parent080739ba1db7897dde53427937acc011ea98a006
Merge branch 'nd/worktree-lock'

"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location.  "git worktree"
command learned a dedicated command pair to create and remove such
a file, so that the users do not have to do this with editor.

* nd/worktree-lock:
  worktree.c: find_worktree() search by path suffix
  worktree: add "unlock" command
  worktree: add "lock" command
  worktree.c: add is_worktree_locked()
  worktree.c: add is_main_worktree()
  worktree.c: add find_worktree()
Documentation/git-worktree.txt
builtin/worktree.c
contrib/completion/git-completion.bash
worktree.c