aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-11 23:29:26 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-11 23:29:26 -0800
commit15624458a9de285fdd8a50cd25bdf83a8c9983b7 (patch)
treef6e4145ac47de94d7f1829cc30f79a3ca5b1cc00
parentd727f676ad9f03c2b2a11ea68a2c6242ca02fa10 (diff)
parent9279bf3ab6739cd5854c21418c5d28412287ba07 (diff)
downloadgit-15624458a9de285fdd8a50cd25bdf83a8c9983b7.tar.gz
git-15624458a9de285fdd8a50cd25bdf83a8c9983b7.tar.xz
Merge branch 'maint'
* maint: Documentation/git-push.txt: minor: compress one option
-rw-r--r--Documentation/git-push.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 6150b1b95..3321966c6 100644
--- 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