summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Paolo Bonzini <pbonzini@redhat.com>2020-06-19 11:32:10 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-06-19 10:26:34 -0700
commit08dc26061f3ff9ee79e6cfda88f0c825b8730e54 (patch)
treebcd70baeab03c5ae747abe89e66a68e747120145 /mergetools
parentGit 2.26.2 (diff)
downloadtgif-08dc26061f3ff9ee79e6cfda88f0c825b8730e54.tar.xz
t4014: do not use "slave branch" nomenclature
Git branches have been qualified as topic branches, integration branches, development branches, feature branches, release branches and so on. Git has a branch that is the master *for* development, but it is not the master *of* any "slave branch": Git does not have slave branches, and has never had, except for a single testcase that claims otherwise. :) Independent of any future change to the naming of the "master" branch, removing this sole appearance of the term is a strict improvement: it avoids divisive language, and talking about "feature branch" clarifies which developer workflow the test is trying to emulate. Reported-by: Till Maas <tmaas@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions