.\" 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\-APPLYPATCH" "1" "10/03/2006" "" ""
+.TH "GIT\-APPLYPATCH" "1" "01/17/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-applypatch \- Apply one patch extracted from an e\-mail
.SH "SYNOPSIS"
\fIgit\-applypatch\fR <msg> <patch> <info> [<signoff>]
-.sp
.SH "DESCRIPTION"
+This is usually not what an end user wants to run directly. See \fBgit\-am\fR(1) instead.
+
Takes three files <msg>, <patch>, and <info> prepared from an e\-mail message by \fIgit\-mailinfo\fR, and creates a commit. It is usually not necessary to use this command directly.
-.sp
+
This command can run applypatch\-msg, pre\-applypatch, and post\-applypatch hooks. See [1]\&\fIhooks\fR for more information.
-.sp
.SH "OPTIONS"
.TP
<msg>
Author and subject information extracted from e\-mail, used on "author" line and as the first line of the commit log message.
.SH "AUTHOR"
Written 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
.SH "REFERENCES"
.TP 3
1.\ hooks
The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more header elements later.
.SH "SPECIFYING RANGES"
-Unlike git\-blame and git\-annotate in older git, the extent of annotation can be limited to both line ranges and revision ranges. When you are interested in finding the origin for ll. 40\-60 for file foo, you can use \-L option like this:
+Unlike git\-blame and git\-annotate in older git, the extent of annotation can be limited to both line ranges and revision ranges. When you are interested in finding the origin for ll. 40\-60 for file foo, you can use \-L option like these (they mean the same thing \(em both ask for 21 lines starting at line 40):
.sp
.nf
git blame \-L 40,60 foo
+git blame \-L 40,+21 foo
.fi
Also you can use regular expression to specify the line range.
.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\-COMMIT\-TREE" "1" "12/31/2006" "" ""
+.TH "GIT\-COMMIT\-TREE" "1" "01/17/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
\fIgit\-commit\-tree\fR <tree> [\-p <parent commit>]* < changelog
.SH "DESCRIPTION"
+This is usually not what an end user wants to run directly. See \fBgit\-commit\fR(1) instead.
+
Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. If no parent is given then it is considered to be an initial tree.
A commit object usually has 1 parent (a commit after a change) or up to 16 parents. More than one parent represents a merge of branches that led to them.
.\" 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\-PACK" "1" "11/08/2006" "" ""
+.TH "GIT\-FETCH\-PACK" "1" "01/17/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-fetch\-pack \- Receive missing objects from another repository
.SH "SYNOPSIS"
\fIgit\-fetch\-pack\fR [\-q] [\-k] [\-\-exec=<git\-upload\-pack>] [<host>:]<directory> [<refs>\&...]
-.sp
.SH "DESCRIPTION"
+Usually you would want to use \fBgit\-fetch\fR(1) which is a higher level wrapper of this command instead.
+
Invokes \fIgit\-upload\-pack\fR on a potentially remote repository, and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally is found out by scanning local $GIT_DIR/refs/ and sent to \fIgit\-upload\-pack\fR running on the other end.
-.sp
+
This command degenerates to download everything to complete the asked refs from the remote side when the local side does not have a common ancestor commit.
-.sp
.SH "OPTIONS"
.TP
\-q
-Pass
-\fI\-q\fR
-flag to
-\fIgit\-unpack\-objects\fR; this makes the cloning process less verbose.
+Pass \fI\-q\fR flag to \fIgit\-unpack\-objects\fR; this makes the cloning process less verbose.
.TP
\-k
-Do not invoke
-\fIgit\-unpack\-objects\fR
-on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking.
+Do not invoke \fIgit\-unpack\-objects\fR on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking.
.TP
\-\-exec=<git\-upload\-pack>
-Use this to specify the path to
-\fIgit\-upload\-pack\fR
-on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in ".bashrc", but this flag is for people who do not want to pay the overhead for non\-interactive shells by having a lean .bashrc file (they set most of the things up in .bash_profile).
+Use this to specify the path to \fIgit\-upload\-pack\fR on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in ".bashrc", but this flag is for people who do not want to pay the overhead for non\-interactive shells by having a lean .bashrc file (they set most of the things up in .bash_profile).
.TP
<host>
-A remote host that houses the repository. When this part is specified,
-\fIgit\-upload\-pack\fR
-is invoked via ssh.
+A remote host that houses the repository. When this part is specified, \fIgit\-upload\-pack\fR is invoked via ssh.
.TP
<directory>
The repository to sync from.
The remote heads to update from. This is relative to $GIT_DIR (e.g. "HEAD", "refs/heads/master"). When unspecified, update from all heads the remote side has.
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>
-.sp
.SH "DOCUMENTATION"
Documentation by Junio C Hamano.
-.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\-MAILINFO" "1" "01/10/2007" "" ""
+.TH "GIT\-MAILINFO" "1" "01/17/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
\fIgit\-mailinfo\fR [\-k] [\-u | \-\-encoding=<encoding>] <msg> <patch>
.SH "DESCRIPTION"
-Reading a single e\-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e\-mail and e\-mail subject are written out to the standard output to be used by git\-applypatch to create a commit. It is usually not necessary to use this command directly.
+Reading a single e\-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e\-mail and e\-mail subject are written out to the standard output to be used by git\-applypatch to create a commit. It is usually not necessary to use this command directly. See \fBgit\-am\fR(1) instead.
.SH "OPTIONS"
.TP
\-k
.\" 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\-PARSE\-REMOTE" "1" "10/03/2006" "" ""
+.TH "GIT\-PARSE\-REMOTE" "1" "01/17/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-parse\-remote \- Routines to help parsing $GIT_DIR/remotes/
.SH "SYNOPSIS"
\fI. git\-parse\-remote\fR
-.sp
.SH "DESCRIPTION"
-This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/.
-.sp
+This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing.
+
The primary entry points are:
-.sp
.TP
get_remote_refs_for_fetch
-Given the list of user\-supplied
-<repo> <refspec>\&..., return the list of refs to fetch after canonicalizing them into
-$GIT_DIR
-relative paths (e.g.
-refs/heads/foo). When
-<refspec>\&...
-is empty the returned list of refs consists of the defaults for the given
-<repo>, if specified in
-$GIT_DIR/remotes/
-or
-$GIT_DIR/branches/.
+Given the list of user\-supplied <repo> <refspec>\&..., return the list of refs to fetch after canonicalizing them into $GIT_DIR relative paths (e.g. refs/heads/foo). When <refspec>\&... is empty the returned list of refs consists of the defaults for the given <repo>, if specified in $GIT_DIR/remotes/, $GIT_DIR/branches/, or remote.*.fetch configuration.
.TP
get_remote_refs_for_push
-Given the list of user\-supplied
-<repo> <refspec>\&..., return the list of refs to push in a form suitable to be fed to the
-git\-send\-pack
-command. When
-<refspec>\&...
-is empty the returned list of refs consists of the defaults for the given
-<repo>, if specified in
-$GIT_DIR/remotes/.
+Given the list of user\-supplied <repo> <refspec>\&..., return the list of refs to push in a form suitable to be fed to the git\-send\-pack command. When <refspec>\&... is empty the returned list of refs consists of the defaults for the given <repo>, if specified in $GIT_DIR/remotes/.
.SH "AUTHOR"
Written by Junio C Hamano.
-.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\-RESOLVE" "1" "10/03/2006" "" ""
+.TH "GIT\-RESOLVE" "1" "01/17/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-resolve \- Merge two commits
.SH "SYNOPSIS"
\fIgit\-resolve\fR <current> <merged> <message>
-.sp
.SH "DESCRIPTION"
+DEPRECATED. Use git\-merge instead.
+
Given two commits and a merge message, merge the <merged> commit into <current> commit, with the commit log message <message>.
-.sp
+
When <current> is a descendant of <merged>, or <current> is an ancestor of <merged>, no new commit is created and the <message> is ignored. The former is informally called "already up to date", and the latter is often called "fast forward".
-.sp
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org> and Dan Holmsand <holmsand@gmail.com>.
-.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\-SEND\-PACK" "1" "10/12/2006" "" ""
+.TH "GIT\-SEND\-PACK" "1" "01/17/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-send\-pack \- Push missing objects packed
.SH "SYNOPSIS"
\fIgit\-send\-pack\fR [\-\-all] [\-\-force] [\-\-exec=<git\-receive\-pack>] [<host>:]<directory> [<ref>\&...]
-.sp
.SH "DESCRIPTION"
+Usually you would want to use \fBgit\-push\fR(1) which is a higher level wrapper of this command instead.
+
Invokes \fIgit\-receive\-pack\fR on a possibly remote repository, and updates it from the current repository, sending named refs.
-.sp
.SH "OPTIONS"
.TP
\-\-exec=<git\-receive\-pack>
-Path to the
-\fIgit\-receive\-pack\fR
-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.
+Path to the \fIgit\-receive\-pack\fR 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.
.TP
\-\-all
Instead of explicitly specifying which refs to update, update all refs that locally exist.
Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care.
.TP
<host>
-A remote host to house the repository. When this part is specified,
-\fIgit\-receive\-pack\fR
-is invoked via ssh.
+A remote host to house the repository. When this part is specified, \fIgit\-receive\-pack\fR is invoked via ssh.
.TP
<directory>
The repository to update.
The remote refs to update.
.SH "SPECIFYING THE REFS"
There are three ways to specify which refs to update on the remote end.
-.sp
+
With \fI\-\-all\fR flag, all refs that exist locally are transferred to the remote side. You cannot specify any \fI<ref>\fR if you use this flag.
-.sp
+
Without \fI\-\-all\fR and without any \fI<ref>\fR, the refs that exist both on the local side and on the remote side are updated.
-.sp
+
When one or more \fI<ref>\fR are specified explicitly, it can be either a single pattern, or a pair of such pattern separated by a colon ":" (this means that a ref name cannot have a colon in it). A single pattern \fI<name>\fR is just a shorthand for \fI<name>:<name>\fR.
-.sp
+
Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side.
-.sp
.TP 3
\(bu
It is an error if <src> does not match exactly one of the local refs.
<src> == <dst> and the ref that matched the <src> must not exist in the set of remote refs; the ref matched <src> locally is used as the name of the destination.
.RE
Without \fI\-\-force\fR, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This check, known as "fast forward check", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples' commits from there.
-.sp
+
With \fI\-\-force\fR, the fast forward check is disabled for all refs.
-.sp
+
Optionally, a <ref> parameter can be prefixed with a plus \fI+\fR sign to disable the fast\-forward check only on that ref.
-.sp
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>
-.sp
.SH "DOCUMENTATION"
Documentation by Junio C Hamano.
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
projects / git.git / commitdiff