summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-08-25 14:24:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-26 18:11:48 (GMT)
commitd8ddb0a41610fffdf9ef1a256d19d5a27face9d7 (patch)
treec3b48136b2a17610d4ed1584a6e4f3ae0b694080 /git-resolve-script
parent23e8673093ff78c32d2e6aa271987d489e2f4c76 (diff)
downloadgit-d8ddb0a41610fffdf9ef1a256d19d5a27face9d7.zip
git-d8ddb0a41610fffdf9ef1a256d19d5a27face9d7.tar.gz
git-d8ddb0a41610fffdf9ef1a256d19d5a27face9d7.tar.bz2
[PATCH] More missing terms in glossary.txt
Describe a DAG and octopus, and change wording of tree object. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions