Documentation: move away misplaced 'push --upstream' description

e9fcd1e (Add push --set-upstream, 2010-01-16) inadvertently patched
the description of --upstream in the middle of that of --repo.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index c63932b16c5292b935d0ddc0b9f022b5275633b4..73a921ca0f224506a0a5587205495c352909db53 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -122,13 +122,6 @@ nor in any Push line of the corresponding remotes file---see below).
        the name "origin" is used. For this latter case, this option
        can be used to override the name "origin". In other words,
        the difference between these two commands
        the name "origin" is used. For this latter case, this option
        can be used to override the name "origin". In other words,
        the difference between these two commands

-
--u::
---set-upstream::
-       For every branch that is up to date or successfully pushed, add
-       upstream (tracking) reference, used by argument-less
-       linkgit:git-pull[1] and other commands. For more information,
-       see 'branch.<name>.merge' in linkgit:git-config[1].

 +
 --------------------------
 git push public         #1
 +
 --------------------------
 git push public         #1


@@ -139,6 +132,13 @@ is that #1 always pushes to "public" whereas #2 pushes to "public"
 only if the current branch does not track a remote branch. This is
 useful if you write an alias or script around 'git push'.
 
 only if the current branch does not track a remote branch. This is
 useful if you write an alias or script around 'git push'.
 

+-u::
+--set-upstream::
+       For every branch that is up to date or successfully pushed, add
+       upstream (tracking) reference, used by argument-less
+       linkgit:git-pull[1] and other commands. For more information,
+       see 'branch.<name>.merge' in linkgit:git-config[1].
+

 --thin::
 --no-thin::
        These options are passed to 'git send-pack'.  Thin
 --thin::
 --no-thin::
        These options are passed to 'git send-pack'.  Thin