summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <derrickstolee@github.com>2022-02-23 14:29:15 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 12:24:42 -0800
commit6036be14581878c42158407a9f3344d63f090057 (patch)
tree93e359c04f3cfb81c3c4c8eb0e212b48a8ed70db /merge-recursive.h
parentworktree: use 'worktree' over 'working tree' (diff)
downloadtgif-6036be14581878c42158407a9f3344d63f090057.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 third of multiple changes to git-worktree.txt, restricted to the OPTIONS section. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions