]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ba7bff 507e6e9)
Merge branch 'nd/worktree-add-lock'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:12 +0000 (15:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:12 +0000 (15:39 +0900)
Allow to lock a worktree immediately after it's created. This helps
prevent a race between "git worktree add; git worktree lock" and
"git worktree prune".

* nd/worktree-add-lock:
  worktree add: add --lock option

1  2 
builtin/worktree.c patch | diff1 | diff2 | blob | history

diff --cc builtin/worktree.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.