Merge branch 'maint'

* maint:
Documentation/git-push.txt: minor: compress one option

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 6150b1b959e17655a2875d39ec3b70449684a0eb..3321966c6b802e575fcd3f67969ccc4e8572925e 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -86,14 +86,12 @@ nor in any Push line of the corresponding remotes file---see below).
        line.
 
 --receive-pack=<git-receive-pack>::
+--exec=<git-receive-pack>::
        Path to the 'git-receive-pack' program on the remote
        end.  Sometimes useful when pushing to a remote
        repository over ssh, and you do not have the program in
        a directory on the default $PATH.
 
---exec=<git-receive-pack>::
-       Same as \--receive-pack=<git-receive-pack>.
-
 -f::
 --force::
        Usually, the command refuses to update a remote ref that is