Merge branch 'rf/maint-mailmap-off-by-one'

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 22d2580129538898933d19582b8c292f6463f6a8..fe46c4258a9c8a9dbab0b789215716065bef00ad 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -175,7 +175,7 @@ useful if you write an alias or script around 'git push'.
 
 --recurse-submodules=check|on-demand::
        Make sure all submodule commits used by the revisions to be
-       pushed are available on a remote tracking branch. If 'check' is
+       pushed are available on a remote-tracking branch. If 'check' is
        used git will verify that all submodule commits that changed in
        the revisions to be pushed are available on at least one remote
        of the submodule. If any commits are missing the push will be