undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-push-refspec-default-doc'

Browse Source 
Clarify in the documentation "what" gets pushed to "where" when the
command line to "git push" does not say these explicitly.

* jc/maint-push-refspec-default-doc:
  Documentation/git-push: clarify the description of defaults
This commit is contained in:
Junio C Hamano 2013-03-21 14:01:47 -07:00
commit 858c2e050f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Documentation/git-push.txt
View File

@ -23,6 +23,17 @@ You can make interesting things happen to a repository
every time you push into it, by setting up 'hooks' there. See every time you push into it, by setting up 'hooks' there. See
documentation for linkgit:git-receive-pack[1]. documentation for linkgit:git-receive-pack[1].
When the command line does not specify where to push with the
`<repository>` argument, `branch.*.remote` configuration for the
current branch is consulted to determine where to push. If the
configuration is missing, it defaults to 'origin'.
When the command line does not specify what to push with `<refspec>...`
arguments or `--all`, `--mirror`, `--tags` options, the command finds
the default `<refspec>` by consulting `remote.*.push` configuration,
and if it is not found, honors `push.default` configuration to decide
what to push (See gitlink:git-config[1] for the meaning of `push.default`).
OPTIONS[[OPTIONS]] OPTIONS[[OPTIONS]]
------------------ ------------------
@ -33,13 +44,10 @@ OPTIONS[[OPTIONS]]
of a remote (see the section <<REMOTES,REMOTES>> below). of a remote (see the section <<REMOTES,REMOTES>> below).
<refspec>...:: <refspec>...::
Specify what destination ref to update with what source object.
The format of a <refspec> parameter is an optional plus The format of a <refspec> parameter is an optional plus
`+`, followed by the source ref <src>, followed `+`, followed by the source object <src>, followed
by a colon `:`, followed by the destination ref <dst>. by a colon `:`, followed by the destination ref <dst>.
It is used to specify with what <src> object the <dst> ref
in the remote repository is to be updated. If not specified,
the behavior of the command is controlled by the `push.default`
configuration variable.
+ +
The <src> is often the name of the branch you would want to push, but The <src> 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 it can be any arbitrary "SHA-1 expression", such as `master~4` or
@ -66,10 +74,7 @@ the remote repository.
The special refspec `:` (or `+:` to allow non-fast-forward updates) The special refspec `:` (or `+:` to allow non-fast-forward updates)
directs Git to push "matching" branches: for every branch that exists on 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 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 already exists on the remote side.
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) and
no `push.default` configuration variable is set.
--all:: --all::
Instead of naming each ref to push, specifies that all Instead of naming each ref to push, specifies that all