Merge branch 'maint'

* maint: Documentation/git-push.txt: minor: compress one option
git-mirror · Jan 12, 2009 · 1562445 · 1562445
2 parents d727f67 + 9279bf3
commit 1562445
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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