diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-01-23 22:18:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 19:01:45 (GMT) |
| commit | 0ed3a111638e83d1fd179e684222b3d3e0ae440f (patch) | |
| tree | e828f532ee4656cea6511c80fbf0187a6d10257f /Documentation | |
| parent | 88955ed247333623694149230fa4c42be1a1419f (diff) | |
| download | git-0ed3a111638e83d1fd179e684222b3d3e0ae440f.zip git-0ed3a111638e83d1fd179e684222b3d3e0ae440f.tar.gz git-0ed3a111638e83d1fd179e684222b3d3e0ae440f.tar.bz2 | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-push.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index c63932b..73a921c 100644 --- 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 - --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 @@ -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'. +-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 |