diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:48 -0800 |
| commit | 533e8af50ed6e89eabc421478c9021c4da5f404d (patch) | |
| tree | 3eb2af3a9800ee068363e3e267dd2347b884c2bd /Documentation | |
| parent | 0877510ad4e8b951b08f9cbb25cfc0d994468979 (diff) | |
| parent | e9fcd1e2121100d43d2d212eb6c6f1fc82aade1d (diff) | |
| download | git-533e8af50ed6e89eabc421478c9021c4da5f404d.tar.gz git-533e8af50ed6e89eabc421478c9021c4da5f404d.tar.xz | |
Merge branch 'il/push-set-upstream'
* il/push-set-upstream:
Add push --set-upstream
Conflicts:
transport.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-push.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index e3eb1e8f1..2a5394b83 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git push' [--all | --mirror | --tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>] - [--repo=<repository>] [-f | --force] [-v | --verbose] + [--repo=<repository>] [-f | --force] [-v | --verbose] [-u | --set-upstream] [<repository> <refspec>...] DESCRIPTION @@ -122,6 +122,13 @@ 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 |