summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <derrickstolee@github.com>2022-02-23 14:29:14 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 12:24:41 -0800
commit599701441e5e7853339306f56e82cb02543d53a7 (patch)
treef77d0c7fef2142afd004c805647107a781557154 /mergetools
parentworktree: use 'worktree' over 'working tree' (diff)
downloadtgif-599701441e5e7853339306f56e82cb02543d53a7.tar.xz
worktree: use 'worktree' over 'working tree'
It is helpful to distinguish between a 'working tree' and a 'worktree'. A worktree contains a working tree plus additional metadata. This metadata includes per-worktree refs and worktree-specific config. This is the second of multiple changes to git-worktree.txt, restricted to the COMMANDS section. There is some language around the movement of "the working tree of a linked worktree" which is used once, but the remaining uses are left as just moving "a linked worktree" for brevity. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions