From: Thomas Rast Date: Sat, 23 Jan 2010 22:18:23 +0000 (+0100) Subject: Documentation: move away misplaced 'push --upstream' description X-Git-Tag: v1.7.0-rc0~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ed3a111638e83d1fd179e684222b3d3e0ae440f;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index c63932b16..73a921ca0 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..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..merge' in linkgit:git-config[1]. + --thin:: --no-thin:: These options are passed to 'git send-pack'. Thin