diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-10-07 16:26:20 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-08 07:15:53 -0700 |
| commit | bf07cc58aeb84b1262cc58f571d2f7033474efa7 (patch) | |
| tree | b7a6de3004882e27956105df936da24af901ebf1 | |
| parent | cced48a808620d60e95a1e51254b135a46ddf719 (diff) | |
| download | git-bf07cc58aeb84b1262cc58f571d2f7033474efa7.tar.gz git-bf07cc58aeb84b1262cc58f571d2f7033474efa7.tar.xz | |
git-push.txt: Describe --repo option in more detail
The --repo option was described in a way that the reader would have to
assume that it is the same as the <repository> parameter. But it actually
servers a purpose, which is now written down.
Furthermore, the --mirror option was missing from the synopsis.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | Documentation/git-push.txt | 24 | ||||
| -rw-r--r-- | builtin-push.c | 2 |
2 files changed, 20 insertions, 6 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 45c96435f..6150b1b95 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -9,8 +9,8 @@ git-push - Update remote refs along with associated objects SYNOPSIS -------- [verse] -'git push' [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] - [--repo=all] [-f | --force] [-v | --verbose] +'git push' [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] + [--repo=<repository>] [-f | --force] [-v | --verbose] [<repository> <refspec>...] DESCRIPTION @@ -101,9 +101,23 @@ nor in any Push line of the corresponding remotes file---see below). This flag disables the check. This can cause the remote repository to lose commits; use it with care. ---repo=<repo>:: - When no repository is specified the command defaults to - "origin"; this overrides it. +--repo=<repository>:: + This option is only relevant if no <repository> argument is + passed in the invocation. In this case, 'git-push' derives the + remote name from the current branch: If it tracks a remote + branch, then that remote repository is pushed to. Otherwise, + 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 ++ +-------------------------- +git push public #1 +git push --repo=public #2 +-------------------------- ++ +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'. --thin:: --no-thin:: diff --git a/builtin-push.c b/builtin-push.c index c1ed68d93..f5cc76266 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -10,7 +10,7 @@ #include "parse-options.h" static const char * const push_usage[] = { - "git push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]", + "git push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]", NULL, }; |