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>
Thomas Rast committed
Jan 23, 2010 at 23:18 UTC
0ed3a111638e83d1fd179e684222b3d3e0ae440f
1 file changed
+7
-7
Documentation/git-push.txt
+7
-7
@@ -122,13 +122,6 @@ nor in any Push line of the corresponding remotes file---see below).
122
the name "origin" is used. For this latter case, this option
123
can be used to override the name "origin". In other words,
124
the difference between these two commands
125
-
126
--u::
127
---set-upstream::
128
- For every branch that is up to date or successfully pushed, add
129
- upstream (tracking) reference, used by argument-less
130
- linkgit:git-pull[1] and other commands. For more information,
131
- see 'branch.<name>.merge' in linkgit:git-config[1].
125
+
126
--------------------------
127
git push public #1
@@ -139,6 +132,13 @@ is that #1 always pushes to "public" whereas #2 pushes to "public"
132
only if the current branch does not track a remote branch. This is
133
useful if you write an alias or script around 'git push'.
134
135
+-u::
136
+--set-upstream::
137
+ For every branch that is up to date or successfully pushed, add
138
+ upstream (tracking) reference, used by argument-less
139
+ linkgit:git-pull[1] and other commands. For more information,
140
+ see 'branch.<name>.merge' in linkgit:git-config[1].
141
+
142
--thin::
143
--no-thin::
144
These options are passed to 'git send-pack'. Thin