.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-FETCH" "1" "10/24/2006" "" ""
+.TH "GIT\-FETCH" "1" "12/31/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-fetch \- Download objects and a head from another repository
.SH "SYNOPSIS"
\fIgit\-fetch\fR <options> <repository> <refspec>\&...
-.sp
.SH "DESCRIPTION"
Fetches named heads or tags from another repository, along with the objects necessary to complete them.
-.sp
+
The ref names and their object names of fetched refs are stored in .git/FETCH_HEAD. This information is left for a later merge operation done by "git merge".
-.sp
.SH "OPTIONS"
.TP
\-a, \-\-append
-Append ref names and object names of fetched refs to the existing contents of
-.git/FETCH_HEAD. Without this option old data in
-.git/FETCH_HEAD
-will be overwritten.
+Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD. Without this option old data in .git/FETCH_HEAD will be overwritten.
.TP
\-\-upload\-pack <upload\-pack>
-When given, and the repository to fetch from is handled by
-\fIgit\-fetch\-pack\fR,
-\fI\-\-exec=<upload\-pack>\fR
-is passed to the command to specify non\-default path for the command run on the other end.
+When given, and the repository to fetch from is handled by \fIgit\-fetch\-pack\fR, \fI\-\-exec=<upload\-pack>\fR is passed to the command to specify non\-default path for the command run on the other end.
.TP
\-f, \-\-force
-When
-git\-fetch
-is used with
-<rbranch>:<lbranch>
-refspec, it refuses to update the local branch
-<lbranch>
-unless the remote branch
-<rbranch>
-it fetches is a descendant of
-<lbranch>. This option overrides that check.
+When git\-fetch is used with <rbranch>:<lbranch> refspec, it refuses to update the local branch <lbranch> unless the remote branch <rbranch> it fetches is a descendant of <lbranch>. This option overrides that check.
.TP
\-\-no\-tags
-By default,
-git\-fetch
-fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this automatic tag following.
+By default, git\-fetch fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this automatic tag following.
.TP
\-t, \-\-tags
Most of the tags are fetched automatically as branch heads are downloaded, but tags that do not point at objects reachable from the branch heads that are being tracked will not be fetched by this mechanism. This flag lets all tags and their associated objects be downloaded.
Keep downloaded pack.
.TP
\-u, \-\-update\-head\-ok
-By default
-git\-fetch
-refuses to update the head which corresponds to the current branch. This flag disables the check. Note that fetching into the current branch will not update the index and working directory, so use it with care.
+By default git\-fetch refuses to update the head which corresponds to the current branch. This flag disables the check. Note that fetching into the current branch will not update the index and working directory, so use it with care.
.TP
<repository>
-The "remote" repository that is the source of a fetch or pull operation. See the section
-GIT URLS
-below.
+The "remote" repository that is the source of a fetch or pull operation. See the section GIT URLS below.
.TP
<refspec>
-The canonical format of a <refspec> parameter is
-+?<src>:<dst>; that is, an optional plus
-+, followed by the source ref, followed by a colon
-:, followed by the destination ref.
-.sp
-The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast forwarded using <src>. Again, if the optional plus
-+
-is used, the local ref is updated even if it does not result in a fast forward update.
+The canonical format of a <refspec> parameter is +?<src>:<dst>; that is, an optional plus +, followed by the source ref, followed by a colon :, followed by the destination ref.
+
+The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast forwarded using <src>. Again, if the optional plus + is used, the local ref is updated even if it does not result in a fast forward update.
.sp
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
\fBNote\fR
-If the remote branch from which you want to pull is modified in non\-linear ways such as being rewound and rebased frequently, then a pull will attempt a merge with an older version of itself, likely conflict, and fail. It is under these conditions that you would want to use the
-+
-sign to indicate non\-fast\-forward updates will be needed. There is currently no easy way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch.
+If the remote branch from which you want to pull is modified in non\-linear ways such as being rewound and rebased frequently, then a pull will attempt a merge with an older version of itself, likely conflict, and fail. It is under these conditions that you would want to use the + sign to indicate non\-fast\-forward updates will be needed. There is currently no easy way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch.
.sp
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
\fBNote\fR
-You never do your own development on branches that appear on the right hand side of a <refspec> colon on
-Pull:
-lines; they are to be updated by
-git\-fetch. If you intend to do development derived from a remote branch
-B, have a
-Pull:
-line to track it (i.e.
-Pull: B:remote\-B), and have a separate branch
-my\-B
-to do your development on top of it. The latter is created by
-git branch my\-B remote\-B
-(or its equivalent
-git checkout \-b my\-B remote\-B). Run
-git fetch
-to keep track of the progress of the remote side, and when you see something new on the remote branch, merge it into your development branch with
-git pull . remote\-B, while you are on
-my\-B
-branch. The common
-Pull: master:origin
-mapping of a remote
-master
-branch to a local
-origin
-branch, which is then merged to a local development branch, again typically named
-master, is made when you run
-git clone
-for you to follow this pattern.
+You never do your own development on branches that appear on the right hand side of a <refspec> colon on Pull: lines; they are to be updated by git\-fetch. If you intend to do development derived from a remote branch B, have a Pull: line to track it (i.e. Pull: B:remote\-B), and have a separate branch my\-B to do your development on top of it. The latter is created by git branch my\-B remote\-B (or its equivalent git checkout \-b my\-B remote\-B). Run git fetch to keep track of the progress of the remote side, and when you see something new on the remote branch, merge it into your development branch with git pull . remote\-B, while you are on my\-B branch. The common Pull: master:origin mapping of a remote master branch to a local origin branch, which is then merged to a local development branch, again typically named master, is made when you run git clone for you to follow this pattern.
.sp
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
\fBNote\fR
-There is a difference between listing multiple <refspec> directly on
-git\-pull
-command line and having multiple
-Pull:
-<refspec> lines for a <repository> and running
-git\-pull
-command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making an Octopus. While
-git\-pull
-run without any explicit <refspec> parameter takes default <refspec>s from
-Pull:
-lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one\-go by fetching more than one is often useful.
+There is a difference between listing multiple <refspec> directly on git\-pull command line and having multiple Pull: <refspec> lines for a <repository> and running git\-pull command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making an Octopus. While git\-pull run without any explicit <refspec> parameter takes default <refspec>s from Pull: lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one\-go by fetching more than one is often useful.
+
Some short\-cut notations are also supported.
.RS
.TP 3
\(bu
-tag <tag>
-means the same as
-refs/tags/<tag>:refs/tags/<tag>; it requests fetching everything up to the given tag.
+tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>; it requests fetching everything up to the given tag.
.TP
\(bu
A parameter <ref> without a colon is equivalent to <ref>: when pulling/fetching, so it merges <ref> into the current branch without storing the remote branch anywhere locally
.RE
.SH "GIT URLS"
One of the following notations can be used to name the remote repository:
-.sp
.IP
.TP 3
\(bu
.TP
\(bu
ssh://[user@]host.xz/~/path/to/repo.git
+
SSH is the default transport protocol. You can optionally specify which user to log\-in as, and an alternate, scp\-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol. The following three are identical to the last three above, respectively:
-.sp
.IP
.TP 3
\(bu
.TP
\(bu
[user@]host.xz:path/to/repo.git
+
To sync with a local directory, use:
-.sp
.IP
.TP 3
\(bu
.SH "REMOTES"
In addition to the above, as a short\-hand, the name of a file in $GIT_DIR/remotes directory can be given; the named file should be in the following format:
.sp
-.sp
.nf
URL: one of the above URL format
Push: <refspec>
Pull: <refspec>
.fi
Then such a short\-hand is specified in place of <repository> without <refspec> parameters on the command line, <refspec> specified on Push: lines or Pull: lines are used for git\-push and git\-fetch/git\-pull, respectively. Multiple Push: and Pull: lines may be specified for additional branch mappings.
-.sp
+
Or, equivalently, in the $GIT_DIR/config (note the use of fetch instead of Pull:):
.sp
-.sp
.nf
-url = <url>
-push = <refspec>
-fetch = <refspec>
+[remote "<remote>"]
+ url = <url>
+ push = <refspec>
+ fetch = <refspec>
.fi
The name of a file in $GIT_DIR/branches directory can be specified as an older notation short\-hand; the named file should contain a single line, a URL in one of the above formats, optionally followed by a hash # and the name of remote head (URL fragment notation). $GIT_DIR/branches/<remote> file that stores a <url> without the fragment is equivalent to have this in the corresponding file in the $GIT_DIR/remotes/ directory.
.sp
-.sp
.nf
URL: <url>
Pull: refs/heads/master:<remote>
.fi
while having <url>#<head> is equivalent to
.sp
-.sp
.nf
URL: <url>
Pull: refs/heads/<head>:<remote>
.fi
.SH "SEE ALSO"
\fBgit\-pull\fR(1)
-.sp
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
-.sp
.SH "DOCUMENTATION"
Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger.kernel.org>.
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PULL" "1" "10/29/2006" "" ""
+.TH "GIT\-PULL" "1" "12/31/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-pull \- Pull and merge from another repository or a local branch
.SH "SYNOPSIS"
\fIgit\-pull\fR <options> <repository> <refspec>\&...
-.sp
.SH "DESCRIPTION"
Runs git\-fetch with the given parameters, and calls git\-merge to merge the retrieved head(s) into the current branch.
-.sp
+
Note that you can use . (current directory) as the <repository> to pull from the local repository \(em this is useful when merging local branches into the current branch.
-.sp
.SH "OPTIONS"
.TP
\-n, \-\-no\-summary
Perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing.
.TP
\-\-squash
-Produce the working tree and index state as if a real merge happened, but do not actually make a commit or move the
-HEAD, nor record
-$GIT_DIR/MERGE_HEAD
-to cause the next
-git commit
-command to create a merge commit. This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus).
+Produce the working tree and index state as if a real merge happened, but do not actually make a commit or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to cause the next git commit command to create a merge commit. This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus).
.TP
\-s <strategy>, \-\-strategy=<strategy>
-Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no
-\-s
-option, a built\-in list of strategies is used instead (git\-merge\-recursive
-when merging a single head,
-git\-merge\-octopus
-otherwise).
+Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no \-s option, a built\-in list of strategies is used instead (git\-merge\-recursive when merging a single head, git\-merge\-octopus otherwise).
.TP
\-a, \-\-append
-Append ref names and object names of fetched refs to the existing contents of
-.git/FETCH_HEAD. Without this option old data in
-.git/FETCH_HEAD
-will be overwritten.
+Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD. Without this option old data in .git/FETCH_HEAD will be overwritten.
.TP
\-\-upload\-pack <upload\-pack>
-When given, and the repository to fetch from is handled by
-\fIgit\-fetch\-pack\fR,
-\fI\-\-exec=<upload\-pack>\fR
-is passed to the command to specify non\-default path for the command run on the other end.
+When given, and the repository to fetch from is handled by \fIgit\-fetch\-pack\fR, \fI\-\-exec=<upload\-pack>\fR is passed to the command to specify non\-default path for the command run on the other end.
.TP
\-f, \-\-force
-When
-git\-fetch
-is used with
-<rbranch>:<lbranch>
-refspec, it refuses to update the local branch
-<lbranch>
-unless the remote branch
-<rbranch>
-it fetches is a descendant of
-<lbranch>. This option overrides that check.
+When git\-fetch is used with <rbranch>:<lbranch> refspec, it refuses to update the local branch <lbranch> unless the remote branch <rbranch> it fetches is a descendant of <lbranch>. This option overrides that check.
.TP
\-\-no\-tags
-By default,
-git\-fetch
-fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this automatic tag following.
+By default, git\-fetch fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this automatic tag following.
.TP
\-t, \-\-tags
Most of the tags are fetched automatically as branch heads are downloaded, but tags that do not point at objects reachable from the branch heads that are being tracked will not be fetched by this mechanism. This flag lets all tags and their associated objects be downloaded.
Keep downloaded pack.
.TP
\-u, \-\-update\-head\-ok
-By default
-git\-fetch
-refuses to update the head which corresponds to the current branch. This flag disables the check. Note that fetching into the current branch will not update the index and working directory, so use it with care.
+By default git\-fetch refuses to update the head which corresponds to the current branch. This flag disables the check. Note that fetching into the current branch will not update the index and working directory, so use it with care.
.TP
<repository>
-The "remote" repository that is the source of a fetch or pull operation. See the section
-GIT URLS
-below.
+The "remote" repository that is the source of a fetch or pull operation. See the section GIT URLS below.
.TP
<refspec>
-The canonical format of a <refspec> parameter is
-+?<src>:<dst>; that is, an optional plus
-+, followed by the source ref, followed by a colon
-:, followed by the destination ref.
-.sp
-The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast forwarded using <src>. Again, if the optional plus
-+
-is used, the local ref is updated even if it does not result in a fast forward update.
+The canonical format of a <refspec> parameter is +?<src>:<dst>; that is, an optional plus +, followed by the source ref, followed by a colon :, followed by the destination ref.
+
+The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast forwarded using <src>. Again, if the optional plus + is used, the local ref is updated even if it does not result in a fast forward update.
.sp
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
\fBNote\fR
-If the remote branch from which you want to pull is modified in non\-linear ways such as being rewound and rebased frequently, then a pull will attempt a merge with an older version of itself, likely conflict, and fail. It is under these conditions that you would want to use the
-+
-sign to indicate non\-fast\-forward updates will be needed. There is currently no easy way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch.
+If the remote branch from which you want to pull is modified in non\-linear ways such as being rewound and rebased frequently, then a pull will attempt a merge with an older version of itself, likely conflict, and fail. It is under these conditions that you would want to use the + sign to indicate non\-fast\-forward updates will be needed. There is currently no easy way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch.
.sp
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
\fBNote\fR
-You never do your own development on branches that appear on the right hand side of a <refspec> colon on
-Pull:
-lines; they are to be updated by
-git\-fetch. If you intend to do development derived from a remote branch
-B, have a
-Pull:
-line to track it (i.e.
-Pull: B:remote\-B), and have a separate branch
-my\-B
-to do your development on top of it. The latter is created by
-git branch my\-B remote\-B
-(or its equivalent
-git checkout \-b my\-B remote\-B). Run
-git fetch
-to keep track of the progress of the remote side, and when you see something new on the remote branch, merge it into your development branch with
-git pull . remote\-B, while you are on
-my\-B
-branch. The common
-Pull: master:origin
-mapping of a remote
-master
-branch to a local
-origin
-branch, which is then merged to a local development branch, again typically named
-master, is made when you run
-git clone
-for you to follow this pattern.
+You never do your own development on branches that appear on the right hand side of a <refspec> colon on Pull: lines; they are to be updated by git\-fetch. If you intend to do development derived from a remote branch B, have a Pull: line to track it (i.e. Pull: B:remote\-B), and have a separate branch my\-B to do your development on top of it. The latter is created by git branch my\-B remote\-B (or its equivalent git checkout \-b my\-B remote\-B). Run git fetch to keep track of the progress of the remote side, and when you see something new on the remote branch, merge it into your development branch with git pull . remote\-B, while you are on my\-B branch. The common Pull: master:origin mapping of a remote master branch to a local origin branch, which is then merged to a local development branch, again typically named master, is made when you run git clone for you to follow this pattern.
.sp
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
\fBNote\fR
-There is a difference between listing multiple <refspec> directly on
-git\-pull
-command line and having multiple
-Pull:
-<refspec> lines for a <repository> and running
-git\-pull
-command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making an Octopus. While
-git\-pull
-run without any explicit <refspec> parameter takes default <refspec>s from
-Pull:
-lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one\-go by fetching more than one is often useful.
+There is a difference between listing multiple <refspec> directly on git\-pull command line and having multiple Pull: <refspec> lines for a <repository> and running git\-pull command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making an Octopus. While git\-pull run without any explicit <refspec> parameter takes default <refspec>s from Pull: lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one\-go by fetching more than one is often useful.
+
Some short\-cut notations are also supported.
.RS
.TP 3
\(bu
-tag <tag>
-means the same as
-refs/tags/<tag>:refs/tags/<tag>; it requests fetching everything up to the given tag.
+tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>; it requests fetching everything up to the given tag.
.TP
\(bu
A parameter <ref> without a colon is equivalent to <ref>: when pulling/fetching, so it merges <ref> into the current branch without storing the remote branch anywhere locally
.RE
.SH "GIT URLS"
One of the following notations can be used to name the remote repository:
-.sp
.IP
.TP 3
\(bu
.TP
\(bu
ssh://[user@]host.xz/~/path/to/repo.git
+
SSH is the default transport protocol. You can optionally specify which user to log\-in as, and an alternate, scp\-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol. The following three are identical to the last three above, respectively:
-.sp
.IP
.TP 3
\(bu
.TP
\(bu
[user@]host.xz:path/to/repo.git
+
To sync with a local directory, use:
-.sp
.IP
.TP 3
\(bu
.SH "REMOTES"
In addition to the above, as a short\-hand, the name of a file in $GIT_DIR/remotes directory can be given; the named file should be in the following format:
.sp
-.sp
.nf
URL: one of the above URL format
Push: <refspec>
Pull: <refspec>
.fi
Then such a short\-hand is specified in place of <repository> without <refspec> parameters on the command line, <refspec> specified on Push: lines or Pull: lines are used for git\-push and git\-fetch/git\-pull, respectively. Multiple Push: and Pull: lines may be specified for additional branch mappings.
-.sp
+
Or, equivalently, in the $GIT_DIR/config (note the use of fetch instead of Pull:):
.sp
-.sp
.nf
-url = <url>
-push = <refspec>
-fetch = <refspec>
+[remote "<remote>"]
+ url = <url>
+ push = <refspec>
+ fetch = <refspec>
.fi
The name of a file in $GIT_DIR/branches directory can be specified as an older notation short\-hand; the named file should contain a single line, a URL in one of the above formats, optionally followed by a hash # and the name of remote head (URL fragment notation). $GIT_DIR/branches/<remote> file that stores a <url> without the fragment is equivalent to have this in the corresponding file in the $GIT_DIR/remotes/ directory.
.sp
-.sp
.nf
URL: <url>
Pull: refs/heads/master:<remote>
.fi
while having <url>#<head> is equivalent to
.sp
-.sp
.nf
URL: <url>
Pull: refs/heads/<head>:<remote>
Fetch the default head from the repository you cloned from and merge it into your current branch.
.TP
git pull \-s ours . obsolete
-Merge local branch
-obsolete
-into the current branch, using
-ours
-merge strategy.
+Merge local branch obsolete into the current branch, using ours merge strategy.
.TP
git pull . fixes enhancements
-Bundle local branch
-fixes
-and
-enhancements
-on top of the current branch, making an Octopus merge.
+Bundle local branch fixes and enhancements on top of the current branch, making an Octopus merge.
.TP
git pull \-\-no\-commit . maint
-Merge local branch
-maint
-into the current branch, but do not make a commit automatically. This can be used when you want to include further changes to the merge, or want to write your own merge commit message.
-.sp
+Merge local branch maint into the current branch, but do not make a commit automatically. This can be used when you want to include further changes to the merge, or want to write your own merge commit message.
+
You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping release/version name would be acceptable.
.TP
Command line pull of multiple branches from one repository
$ git fetch origin master:origin +pu:pu maint:maint
$ git pull . origin
.fi
-Here, a typical
-.git/remotes/origin
-file from a
-git\-clone
-operation is used in combination with command line options to
-git\-fetch
-to first update multiple branches of the local repository and then to merge the remote
-origin
-branch into the local
-master
-branch. The local
-pu
-branch is updated even if it does not result in a fast forward update. Here, the pull can obtain its objects from the local repository using
-., as the previous
-git\-fetch
-is known to have already obtained and made available all the necessary objects.
+Here, a typical .git/remotes/origin file from a git\-clone operation is used in combination with command line options to git\-fetch to first update multiple branches of the local repository and then to merge the remote origin branch into the local master branch. The local pu branch is updated even if it does not result in a fast forward update. Here, the pull can obtain its objects from the local repository using ., as the previous git\-fetch is known to have already obtained and made available all the necessary objects.
.TP
Pull of multiple branches from one repository using .git/remotes file
.sp
$ git checkout master
$ git pull origin
.fi
-Here, a typical
-.git/remotes/origin
-file from a
-git\-clone
-operation has been hand\-modified to include the branch\-mapping of additional remote and local heads directly. A single
-git\-pull
-operation while in the
-master
-branch will fetch multiple heads and merge the remote
-origin
-head into the current, local
-master
-branch.
+Here, a typical .git/remotes/origin file from a git\-clone operation has been hand\-modified to include the branch\-mapping of additional remote and local heads directly. A single git\-pull operation while in the master branch will fetch multiple heads and merge the remote origin head into the current, local master branch.
+
If you tried a pull which resulted in a complex conflicts and would want to start over, you can recover with \fBgit\-reset\fR(1).
-.sp
.SH "SEE ALSO"
\fBgit\-fetch\fR(1), \fBgit\-merge\fR(1)
-.sp
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
-.sp
.SH "DOCUMENTATION"
Documentation by Jon Loeliger, David Greaves, Junio C Hamano and the git\-list <git@vger.kernel.org>.
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PUSH" "1" "12/13/2006" "" ""
+.TH "GIT\-PUSH" "1" "12/31/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-push \- Update remote refs along with associated objects
.SH "SYNOPSIS"
\fIgit\-push\fR [\-\-all] [\-\-tags] [\-f | \-\-force] <repository> <refspec>\&...
-.sp
.SH "DESCRIPTION"
Updates remote refs using local refs, while sending objects necessary to complete the given refs.
-.sp
+
You can make interesting things happen to a repository every time you push into it, by setting up \fIhooks\fR there. See documentation for \fBgit\-receive\-pack\fR(1).
-.sp
.SH "OPTIONS"
.TP
<repository>
-The "remote" repository that is destination of a push operation. See the section
-GIT URLS
-below.
+The "remote" repository that is destination of a push operation. See the section GIT URLS below.
.TP
<refspec>
-The canonical format of a <refspec> parameter is
-+?<src>:<dst>; that is, an optional plus
-+, followed by the source ref, followed by a colon
-:, followed by the destination ref.
-.sp
-The <src> side can be an arbitrary "SHA1 expression" that can be used as an argument to
-git\-cat\-file \-t. E.g.
-master~4
-(push four parents before the current master head).
-.sp
-The local ref that matches <src> is used to fast forward the remote ref that matches <dst>. If the optional plus
-+
-is used, the remote ref is updated even if it does not result in a fast forward update.
-.sp
+The canonical format of a <refspec> parameter is +?<src>:<dst>; that is, an optional plus +, followed by the source ref, followed by a colon :, followed by the destination ref.
+
+The <src> side can be an arbitrary "SHA1 expression" that can be used as an argument to git\-cat\-file \-t. E.g. master~4 (push four parents before the current master head).
+
+The local ref that matches <src> is used to fast forward the remote ref that matches <dst>. If the optional plus + is used, the remote ref is updated even if it does not result in a fast forward update.
+
Note: 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), then all the refs that exist both on the local side and on the remote side are updated.
-.sp
-tag <tag>
-means the same as
-refs/tags/<tag>:refs/tags/<tag>.
-.sp
+
+tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>.
+
A parameter <ref> without a colon is equivalent to <ref>:<ref>, hence updates <ref> in the destination from <ref> in the source.
-.sp
+
Pushing an empty <src> allows you to delete the <dst> ref from the remote repository.
.TP
\-\-all
Instead of naming each ref to push, specifies that all refs be pushed.
.TP
\-\-tags
-All refs under
-$GIT_DIR/refs/tags
-are pushed, in addition to refspecs explicitly listed on the command line.
+All refs under $GIT_DIR/refs/tags are pushed, in addition to refspecs explicitly listed on the command line.
.TP
\-f, \-\-force
Usually, the command refuses to update a remote ref that is not a descendant of the local ref used to overwrite it. This flag disables the check. This can cause the remote repository to lose commits; use it with care.
.SH "GIT URLS"
One of the following notations can be used to name the remote repository:
-.sp
.IP
.TP 3
\(bu
.TP
\(bu
ssh://[user@]host.xz/~/path/to/repo.git
+
SSH is the default transport protocol. You can optionally specify which user to log\-in as, and an alternate, scp\-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol. The following three are identical to the last three above, respectively:
-.sp
.IP
.TP 3
\(bu
.TP
\(bu
[user@]host.xz:path/to/repo.git
+
To sync with a local directory, use:
-.sp
.IP
.TP 3
\(bu
.SH "REMOTES"
In addition to the above, as a short\-hand, the name of a file in $GIT_DIR/remotes directory can be given; the named file should be in the following format:
.sp
-.sp
.nf
URL: one of the above URL format
Push: <refspec>
Pull: <refspec>
.fi
Then such a short\-hand is specified in place of <repository> without <refspec> parameters on the command line, <refspec> specified on Push: lines or Pull: lines are used for git\-push and git\-fetch/git\-pull, respectively. Multiple Push: and Pull: lines may be specified for additional branch mappings.
-.sp
+
Or, equivalently, in the $GIT_DIR/config (note the use of fetch instead of Pull:):
.sp
-.sp
.nf
-url = <url>
-push = <refspec>
-fetch = <refspec>
+[remote "<remote>"]
+ url = <url>
+ push = <refspec>
+ fetch = <refspec>
.fi
The name of a file in $GIT_DIR/branches directory can be specified as an older notation short\-hand; the named file should contain a single line, a URL in one of the above formats, optionally followed by a hash # and the name of remote head (URL fragment notation). $GIT_DIR/branches/<remote> file that stores a <url> without the fragment is equivalent to have this in the corresponding file in the $GIT_DIR/remotes/ directory.
.sp
-.sp
.nf
URL: <url>
Pull: refs/heads/master:<remote>
.fi
while having <url>#<head> is equivalent to
.sp
-.sp
.nf
URL: <url>
Pull: refs/heads/<head>:<remote>
.fi
.SH "AUTHOR"
Written by Junio C Hamano <junkio@cox.net>, later rewritten in C by Linus Torvalds <torvalds@osdl.org>
-.sp
.SH "DOCUMENTATION"
Documentation by Junio C Hamano and the git\-list <git@vger.kernel.org>.
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REPO\-CONFIG" "1" "12/29/2006" "" ""
+.TH "GIT\-REPO\-CONFIG" "1" "12/31/2006" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-repo\-config will ensure that the output is "true" or "false"
.TP
\-\-int
-git\-repo\-config will ensure that the output is a simple decimal number
+git\-repo\-config will ensure that the output is a simple decimal number. An optional value suffix of \fIk\fR, \fIm\fR, or \fIg\fR in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output.
.SH "ENVIRONMENT"
.TP
GIT_CONFIG
.TP
core.logAllRefUpdates
Updates to a ref <ref> is logged to the file "$GIT_DIR/logs/<ref>", by appending the new and old SHA1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/<ref>" file is automatically created for branch heads.
-.sp
-.nf
-This information can be used to determine what commit
-was the tip of a branch "2 days ago".
-.fi
-.sp
-.nf
-This value is true by default in a repository that has
-a working directory associated with it, and false by
-default in a bare repository.
-.fi
+
+This information can be used to determine what commit was the tip of a branch "2 days ago".
+
+This value is true by default in a repository that has a working directory associated with it, and false by default in a bare repository.
.TP
core.repositoryFormatVersion
Internal variable identifying the repository format and layout version.
projects / git.git / commitdiff