X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=contrib%2Fexamples%2Fgit-merge.sh;h=a5e42a9f0124afcced9b639879f24916e0714e1c;hb=a8a5406ab32fccabf8ed08001d50b5373e18ff1a;hp=7b922c39480c8b78d0687cbabac59672f9ae6ede;hpb=bb8040f9f9274d739b894230959134584b156ae5;p=thirdparty%2Fgit.git

diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 7b922c3948..a5e42a9f01 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -263,7 +263,7 @@ fi
 
 # This could be traditional "merge <msg> HEAD <commit>..."  and the
 # way we can tell it is to see if the second token is HEAD, but some
-# people might have misused the interface and used a committish that
+# people might have misused the interface and used a commit-ish that
 # is the same as HEAD there instead.  Traditional format never would
 # have "-m" so it is an additional safety measure to check for it.