X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-push.txt;h=fd53c49fb886b196ba79e40c4c9c4efe0dae5432;hb=8cc15acfb8845bd23f68c92a51b68d57a72a9fed;hp=6150b1b959e17655a2875d39ec3b70449684a0eb;hpb=a1eb73d917e15cd97314e0a39cbe857329339a96;p=git.git diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 6150b1b95..fd53c49fb 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects SYNOPSIS -------- [verse] -'git push' [--all | --mirror] [--dry-run] [--tags] [--receive-pack=] +'git push' [--all | --mirror | --tags] [--dry-run] [--receive-pack=] [--repo=] [-f | --force] [-v | --verbose] [ ...] @@ -24,40 +24,45 @@ every time you push into it, by setting up 'hooks' there. See documentation for linkgit:git-receive-pack[1]. -OPTIONS -------- +OPTIONS[[OPTIONS]] +------------------ :: The "remote" repository that is destination of a push - operation. See the section <> below. + operation. This parameter can be either a URL + (see the section <> below) or the name + of a remote (see the section <> below). ...:: - The canonical format of a parameter is - `+?:`; that is, an optional plus `{plus}`, followed - by the source ref, followed by a colon `:`, followed by - the destination ref. + The format of a parameter is an optional plus + `{plus}`, followed by the source ref , followed + by a colon `:`, followed by the destination ref . + It is used to specify with what object the ref + in the remote repository is to be updated. + -The side represents the source branch (or arbitrary -"SHA1 expression", such as `master~4` (four parents before the -tip of `master` branch); see linkgit:git-rev-parse[1]) that you -want to push. The side represents the destination location. +The is often the name of the branch you would want to push, but +it can be any arbitrary "SHA-1 expression", such as `master~4` or +`HEAD` (see linkgit:git-rev-parse[1]). + -The local ref that matches is used -to fast forward the remote ref that matches (or, if no was -specified, the same ref that referred to locally). If -the optional leading plus `+` is used, the remote ref is updated -even if it does not result in a fast forward update. +The tells which ref on the remote side is updated with this +push. Arbitrary expressions cannot be used here, an actual ref must +be named. If `:` is omitted, the same ref as will be +updated. + -`tag ` means the same as `refs/tags/:refs/tags/`. +The object referenced by is used to update the reference +on the remote side, but by default this is only allowed if the +update can fast forward . By having the optional leading `{plus}`, +you can tell git to update the ref even when the update is not a +fast forward. This does *not* attempt to merge into . See +EXAMPLES below for details. + -A parameter without a colon pushes the from the source -repository to the destination repository under the same name. +`tag ` means the same as `refs/tags/:refs/tags/`. + Pushing an empty allows you to delete the ref from the remote repository. + -The special refspec `:` (or `+:` to allow non-fast forward updates) -directs git to push "matching" heads: for every head that exists on -the local side, the remote side is updated if a head of the same name +The special refspec `:` (or `{plus}:` to allow non-fast forward updates) +directs git to push "matching" branches: for every branch that exists on +the local side, the remote side is updated if a branch of the same name already exists on the remote side. This is the default operation mode if no explicit refspec is found (that is neither on the command line nor in any Push line of the corresponding remotes file---see below). @@ -86,14 +91,12 @@ nor in any Push line of the corresponding remotes file---see below). line. --receive-pack=:: +--exec=:: Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. ---exec=:: - Same as \--receive-pack=. - -f:: --force:: Usually, the command refuses to update a remote ref that is @@ -184,6 +187,28 @@ reason:: Examples -------- +git push:: + Works like `git push `, where is the + current branch's remote (or `origin`, if no remote is + configured for the current branch). + +git push origin:: + Without additional configuration, works like + `git push origin :`. ++ +The default behavior of this command when no is given can be +configured by setting the `push` option of the remote. ++ +For example, to default to pushing only the current branch to `origin` +use `git config remote.origin.push HEAD`. Any valid (like +the ones in the examples below) can be configured as the default for +`git push origin`. + +git push origin ::: + Push "matching" branches to `origin`. See + in the <> section above for a + description of "matching" branches. + git push origin master:: Find a ref that matches `master` in the source repository (most likely, it would find `refs/heads/master`), and update @@ -191,9 +216,9 @@ git push origin master:: with it. If `master` did not exist remotely, it would be created. -git push origin :experimental:: - Find a ref that matches `experimental` in the `origin` repository - (e.g. `refs/heads/experimental`), and delete it. +git push origin HEAD:: + A handy way to push the current branch to the same name on the + remote. git push origin master:satellite/master dev:satellite/dev:: Use the source ref that matches `master` (e.g. `refs/heads/master`) @@ -201,6 +226,11 @@ git push origin master:satellite/master dev:satellite/dev:: `refs/remotes/satellite/master`) in the `origin` repository, then do the same for `dev` and `satellite/dev`. +git push origin HEAD:master:: + Push the current branch to the remote ref matching `master` in the + `origin` repository. This form is convenient to push the current + branch without thinking about its local name. + git push origin master:refs/heads/experimental:: Create the branch `experimental` in the `origin` repository by copying the current `master` branch. This form is only @@ -208,6 +238,35 @@ git push origin master:refs/heads/experimental:: the local name and the remote name are different; otherwise, the ref name on its own will work. +git push origin :experimental:: + Find a ref that matches `experimental` in the `origin` repository + (e.g. `refs/heads/experimental`), and delete it. + +git push origin {plus}dev:master:: + Update the origin repository's master branch with the dev branch, + allowing non-fast forward updates. *This can leave unreferenced + commits dangling in the origin repository.* Consider the + following situation, where a fast forward is not possible: ++ +---- + o---o---o---A---B origin/master + \ + X---Y---Z dev +---- ++ +The above command would change the origin repository to ++ +---- + A---B (unnamed branch) + / + o---o---o---X---Y---Z master +---- ++ +Commits A and B would no longer belong to a branch with a symbolic name, +and so would be unreachable. As such, these commits would be removed by +a `git gc` command on the origin repository. + + Author ------ Written by Junio C Hamano , later rewritten in C