Merge branch 'nd/gc-lock-against-each-other'

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index e2992f17a0e4e0e78630ee8cbc1c723a70d855e2..9eec74091097c0ea5c9fea69a09eb63e3cebd8d9 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -121,7 +121,7 @@ already exists on the remote side.
 --follow-tags::
        Push all the refs that would be pushed without this option,
        and also push annotated tags in `refs/tags` that are missing
-       from the remote but are pointing at committish that are
+       from the remote but are pointing at commit-ish that are
        reachable from the refs being pushed.
 
 --receive-pack=<git-receive-pack>::