.\" 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\-AM" "1" "10/03/2006" "" ""
+.TH "GIT\-AM" "1" "01/09/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
.sp
.nf
-\fIgit\-am\fR [\-\-signoff] [\-\-dotest=<dir>] [\-\-utf8] [\-\-binary] [\-\-3way]
+\fIgit\-am\fR [\-\-signoff] [\-\-dotest=<dir>] [\-\-utf8 | \-\-no\-utf8] [\-\-binary] [\-\-3way]
[\-\-interactive] [\-\-whitespace=<option>] <mbox>\&...
\fIgit\-am\fR [\-\-skip | \-\-resolved]
.fi
.SH "DESCRIPTION"
Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch.
-.sp
.SH "OPTIONS"
.TP
\-\-signoff
-Add
-Signed\-off\-by:
-line to the commit message, using the committer identity of yourself.
+Add Signed\-off\-by: line to the commit message, using the committer identity of yourself.
.TP
\-\-dotest=<dir>
-Instead of
-.dotest
-directory, use <dir> as a working area to store extracted patches.
+Instead of .dotest directory, use <dir> as a working area to store extracted patches.
+.TP
+\-\-keep
+Pass \-k flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)).
+.TP
+\-\-utf8
+Pass \-u flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)). The proposed commit log message taken from the e\-mail are re\-coded into UTF\-8 encoding (configuration variable i18n.commitencoding can be used to specify project's preferred encoding if it is not UTF\-8).
+
+This was optional in prior versions of git, but now it is the default. You could use \-\-no\-utf8 to override this.
.TP
-\-\-utf8, \-\-keep
-Pass
-\-u
-and
-\-k
-flags to
-git\-mailinfo
-(see
-\fBgit\-mailinfo\fR(1)).
+\-\-no\-utf8
+Do not pass \-u flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)).
.TP
\-\-binary
-Pass
-\-\-allow\-binary\-replacement
-flag to
-git\-apply
-(see
-\fBgit\-apply\fR(1)).
+Pass \-\-allow\-binary\-replacement flag to git\-apply (see \fBgit\-apply\fR(1)).
.TP
\-\-3way
When the patch does not apply cleanly, fall back on 3\-way merge, if the patch records the identity of blobs it is supposed to apply to, and we have those blobs locally.
Skip the current patch. This is only meaningful when restarting an aborted patch.
.TP
\-\-whitespace=<option>
-This flag is passed to the
-git\-apply
-program that applies the patch.
+This flag is passed to the git\-apply program that applies the patch.
.TP
\-\-interactive
Run interactively, just like git\-applymbox.
After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e\-mail message and the current index file, and continue.
.SH "DISCUSSION"
When initially invoking it, you give it names of the mailboxes to crunch. Upon seeing the first patch that does not apply, it aborts in the middle, just like \fIgit\-applymbox\fR does. You can recover from this in one of two ways:
-.sp
.TP 3
1.
-skip the current one by re\-running the command with
-\fI\-\-skip\fR
-option.
+skip the current one by re\-running the command with \fI\-\-skip\fR option.
.TP
2.
-hand resolve the conflict in the working directory, and update the index file to bring it in a state that the patch should have produced. Then run the command with
-\fI\-\-resolved\fR
-option.
+hand resolve the conflict in the working directory, and update the index file to bring it in a state that the patch should have produced. Then run the command with \fI\-\-resolved\fR option.
+
The command refuses to process new mailboxes while .dotest directory exists, so if you decide to start over from scratch, run rm \-f .dotest before running the command with mailbox names.
-.sp
.SH "SEE ALSO"
\fBgit\-applymbox\fR(1), \fBgit\-applypatch\fR(1), \fBgit\-apply\fR(1).
-.sp
.SH "AUTHOR"
Written by Junio C Hamano <junkio@cox.net>
-.sp
.SH "DOCUMENTATION"
Documentation by Petr Baudis, 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\-PACK\-REFS" "1" "11/07/2006" "" ""
+.TH "GIT\-PACK\-REFS" "1" "01/09/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "NAME"
git\-pack\-refs \- Pack heads and tags for efficient repository access
.SH "SYNOPSIS"
-\fIgit\-pack\-refs\fR [\-\-all] [\-\-prune]
-.sp
+\fIgit\-pack\-refs\fR [\-\-all] [\-\-no\-prune]
.SH "DESCRIPTION"
Traditionally, tips of branches and tags (collectively known as \fIrefs\fR) were stored one file per ref under $GIT_DIR/refs directory. While many branch tips tend to be updated often, most tags and some branch tips are never updated. When a repository has hundreds or thousands of tags, this one\-file\-per\-ref format both wastes storage and hurts performance.
-.sp
+
This command is used to solve the storage and performance problem by stashing the refs in a single file, $GIT_DIR/packed\-refs. When a ref is missing from the traditional $GIT_DIR/refs hierarchy, it is looked up in this file and used if found.
-.sp
+
Subsequent updates to branches always creates new file under $GIT_DIR/refs hierarchy.
-.sp
.SH "OPTIONS"
.TP
\-\-all
The command by default packs all tags and leaves branch tips alone. This is because branches are expected to be actively developed and packing their tips does not help performance. This option causes branch tips to be packed as well. Useful for a repository with many branches of historical interests.
.TP
-\-\-prune
-After packing the refs, remove loose refs under
-$GIT_DIR/refs
-hierarchy. This should probably become default.
+\-\-no\-prune
+The command usually removes loose refs under $GIT_DIR/refs hierarchy after packing them. This option tells it not to.
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
--- /dev/null
+.\" ** You probably do not want to edit this file directly **
+.\" 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\-REMOTE" "1" "01/09/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+git\-remote \- manage set of tracked repositories
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit\-remote\fR
+\fIgit\-remote\fR add <name> <url>
+\fIgit\-remote\fR show <name>
+.fi
+.SH "DESCRIPTION"
+Manage the set of repositories ("remotes") whose branches you track.
+
+With no arguments, shows a list of existing remotes.
+
+In the second form, adds a remote named <name> for the repository at <url>. The command git fetch <name> can then be used to create and update remote\-tracking branches <name>/<branch>.
+
+In the third form, gives some information about the remote <name>.
+
+The remote configuration is achieved using the remote.origin.url and remote.origin.fetch configuration variables. (See \fBgit\-repo\-config\fR(1)).
+.SH "EXAMPLES"
+Add a new remote, fetch, and check out a branch from it:
+.sp
+.nf
+$ git remote
+origin
+$ git branch \-r
+origin/master
+$ git remote add linux\-nfs git://linux\-nfs.org/pub/nfs\-2.6.git
+$ git remote
+linux\-nfs
+origin
+$ git fetch
+* refs/remotes/linux\-nfs/master: storing branch 'master' ...
+ commit: bf81b46
+$ git branch \-r
+origin/master
+linux\-nfs/master
+$ git checkout \-b nfs linux\-nfs/master
+...
+.fi
+.SH "SEE ALSO"
+\fBgit\-fetch\fR(1) \fBgit\-branch\fR(1) \fBgit\-repo\-config\fR(1)
+.SH "AUTHOR"
+Written by Junio Hamano
+.SH "DOCUMENTATION"
+Documentation by J. Bruce Fields and the git\-list <git@vger.kernel.org>.
+.SH "GIT"
+Part of the \fBgit\fR(7) suite
+
projects / git.git / commitdiff