summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2018-04-16 08:43:16 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-17 11:23:23 +0900
commita279b74c685f57217ee0bb58faf113607ef67129 (patch)
tree5567d05ee4b9b1d524f191f94bec210c99c62b4a /.gitmodules
parentMerge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn (diff)
downloadtgif-a279b74c685f57217ee0bb58faf113607ef67129.tar.xz
glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
Even though "direct ancestor" is not defined in the glossary, the common meaning of the term is simply "parent", parents being the only direct ancestors, and the rest of ancestors being indirect ancestors. As "parent" is obviously wrong in this place in the description, we should simply say "ancestor", as everywhere else. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions