Merge branch 'maint'

diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt
index 4796224244d6025554a8f1f2cf47b92529f7898c..5e2ca8dccfb291bc4c50df3b0a8dfe2f28d07b59 100644 (file)
--- a/Documentation/git-ssh-upload.txt
+++ b/Documentation/git-ssh-upload.txt
@@ -12,6 +12,8 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
+THIS COMMAND IS DEPRECATED.
+
 Pushes from a remote repository over ssh connection, invoking
 git-ssh-fetch on the other end. It functions identically to
 git-ssh-fetch, aside from which end you run it on.