summaryrefslogtreecommitdiff
path: root/Documentation/config/mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Stephen Manz <smanz@alum.mit.edu>2021-07-15 02:32:30 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-15 13:30:59 -0700
commit0db4961c49bb70cef89ed3d7c90f8f5d9dfc822d (patch)
treef10f2d05c39256c27539c57ecea1be698152b872 /Documentation/config/mergetool.txt
parentworktree: mark lock strings with `_()` for translation (diff)
downloadtgif-0db4961c49bb70cef89ed3d7c90f8f5d9dfc822d.tar.xz
worktree: teach `add` to accept --reason <string> with --lock
The default reason stored in the lock file, "added with --lock", is unlikely to be what the user would have given in a separate `git worktree lock` command. Allowing `--reason` to be specified along with `--lock` when adding a working tree gives the user control over the reason for locking without needing a second command. Signed-off-by: Stephen Manz <smanz@alum.mit.edu> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/mergetool.txt')
0 files changed, 0 insertions, 0 deletions