]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sm/worktree-add-lock'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Jul 2021 20:17:58 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Jul 2021 20:17:58 +0000 (13:17 -0700)
"git worktree add --lock" learned to record why the worktree is
locked with a custom message.

* sm/worktree-add-lock:
  worktree: teach `add` to accept --reason <string> with --lock
  worktree: mark lock strings with `_()` for translation
  t2400: clean up '"add" worktree with lock' test

1  2 
Documentation/git-worktree.txt

Simple merge