Skip to content

Commit 0ed3a11

Browse files
trastgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 88955ed commit 0ed3a11

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Documentation/git-push.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,6 @@ nor in any Push line of the corresponding remotes file---see below).
122122
the name "origin" is used. For this latter case, this option
123123
can be used to override the name "origin". In other words,
124124
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].
132125
+
133126
--------------------------
134127
git push public #1
@@ -139,6 +132,13 @@ is that #1 always pushes to "public" whereas #2 pushes to "public"
139132
only if the current branch does not track a remote branch. This is
140133
useful if you write an alias or script around 'git push'.
141134

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+
142142
--thin::
143143
--no-thin::
144144
These options are passed to 'git send-pack'. Thin

0 commit comments

Comments
 (0)