summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorRichard Hansen <rhansen@bbn.com>2013-09-04 19:04:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-04 22:02:56 (GMT)
commitbb8040f9f9274d739b894230959134584b156ae5 (patch)
treef7684c21fbba555276e9069662f4c887fbe67910 /contrib/examples/git-merge.sh
parent406fde17da450036acc35316c085e32bbd73ebc1 (diff)
downloadgit-bb8040f9f9274d739b894230959134584b156ae5.zip
git-bb8040f9f9274d739b894230959134584b156ae5.tar.gz
git-bb8040f9f9274d739b894230959134584b156ae5.tar.bz2
use 'tree-ish' instead of 'treeish'
Replace 'treeish' in documentation and comments with 'tree-ish' to match gitglossary(7). The only remaining instances of 'treeish' are: * variable, function, and macro names * "(also treeish)" in the definition of tree-ish in gitglossary(7) Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions