Merge branch 'fc/t3200-fixes'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f7334904dc58c85da024827c8a0d037fe515e1c1..44e7873521b05b78e0c5655e39a64c7b06cddb7e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -170,8 +170,8 @@ advice.*::
        pushNeedsForce::
                Shown when linkgit:git-push[1] rejects an update that
                tries to overwrite a remote ref that points at an
-               object that is not a committish, or make the remote
-               ref point at an object that is not a committish.
+               object that is not a commit-ish, or make the remote
+               ref point at an object that is not a commit-ish.
        statusHints::
                Show directions on how to proceed from the current
                state in the output of linkgit:git-status[1], in