Merge branch 'maint'

* maint: Documentation/git-push.txt: minor: compress one option
2009-01-11 23:29:26 -08:00 · 2009-01-11 23:29:26 -08:00 · 15624458a9
parent d727f676ad 9279bf3ab6
commit 15624458a9
1 changed files with 1 additions and 3 deletions
--- 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