.\" 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\-BUNDLE" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-BUNDLE" "1" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "EXAMPLE"
Assume two repositories exist as R1 on machine A, and R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc). We want to update R2 with developments made on branch master in R1. We set a tag in R1 (lastR2bundle) after the previous such transport, and move it afterwards to help build the bundle.
-in R1 on A: $ git\-bundle create mybundle master ^lastR2bundle $ git tag \-f lastR2bundle master
+in R1 on A:
+.sp
+.nf
+.ft C
+$ git\-bundle create mybundle master ^lastR2bundle
+$ git tag \-f lastR2bundle master
+.ft
+.fi
(move mybundle from A to B by some mechanism)
-in R2 on B: $ git\-bundle verify mybundle $ git\-fetch mybundle refspec
+in R2 on B:
+.sp
+.nf
+.ft C
+$ git\-bundle verify mybundle
+$ git\-fetch mybundle refspec
+.ft
+.fi
where refspec is refInBundle:localRef
Also, with something like this in your config:
fetch = refs/heads/*:refs/remotes/origin/*
.fi
You can first sneakernet the bundle file to ~/tmp/file.bdl and then these commands:
+.sp
+.nf
+.ft C
+$ git ls\-remote bundle
+$ git fetch bundle
+$ git pull bundle
+.ft
-$ git ls\-remote bundle $ git fetch bundle $ git pull bundle
-
+.fi
would treat it as if it is talking with a remote side over the network.
.SH "AUTHOR"
Written by Mark Levedahl <mdl123@verizon.net>
.\" 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\-MERGE" "1" "08/02/2007" "Git 1.5.3.rc3.120.g68d422" "Git Manual"
+.TH "GIT\-MERGE" "1" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Whether to include summaries of merged commits in newly created merge commit. False by default.
.TP
merge.verbosity
-Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overriden by \fIGIT_MERGE_VERBOSITY\fR environment variable.
+Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by \fIGIT_MERGE_VERBOSITY\fR environment variable.
.SH "HOW MERGE WORKS"
A merge is always between the current HEAD and one or more remote branch heads, and the index file must exactly match the tree of HEAD commit (i.e. the contents of the last commit) when it happens. In other words, git\-diff \-\-cached HEAD must report no changes.
.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\-REMOTE" "1" "09/15/2007" "Git 1.5.3.1.91.gd3392" "Git Manual"
+.TH "GIT\-REMOTE" "1" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.nf
\fIgit\-remote\fR
\fIgit\-remote\fR add [\-t <branch>] [\-m <branch>] [\-f] [\-\-mirror] <name> <url>
+\fIgit\-remote\fR rm <name>
\fIgit\-remote\fR show <name>
\fIgit\-remote\fR prune <name>
\fIgit\-remote\fR update [group]
In mirror mode, enabled with \-\-mirror, the refs will not be stored in the \fIrefs/remotes/\fR namespace, but in \fIrefs/heads/\fR. This option only makes sense in bare repositories.
.TP
+\fIrm\fR
+Remove the remote named <name>. All remote tracking branches and configuration settings for the remote are removed.
+.TP
\fIshow\fR
Gives some information about the remote <name>.
.\" 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\-EMAIL" "1" "09/06/2007" "Git 1.5.3.1.4.gad00" "Git Manual"
+.TH "GIT\-SEND\-EMAIL" "1" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-\-smtp\-server
If set, specifies the outgoing SMTP server to use (e.g. smtp.example.com or a raw IP address). Alternatively it can specify a full pathname of a sendmail\-like program instead; the program must support the \-i option. Default value can be specified by the \fIsendemail.smtpserver\fR configuration option; the built\-in default is /usr/sbin/sendmail or /usr/lib/sendmail if such program is available, or localhost otherwise.
.TP
+\-\-smtp\-server\-port
+Specifies a port different from the default port (SMTP servers typically listen to smtp port 25 and ssmtp port 465).
+.TP
\-\-smtp\-user, \-\-smtp\-pass
Username and password for SMTP\-AUTH. Defaults are the values of the configuration values \fIsendemail.smtpuser\fR and \fIsendemail.smtppass\fR, but see also \fIsendemail.identity\fR. If not set, authentication is not attempted.
.TP
.\" 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\-SUBMODULE" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-SUBMODULE" "1" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "COMMANDS"
.TP
add
-Add the given repository as a submodule at the given path to the changeset to be committed next. In particular, the repository is cloned at the specified path, added to the changeset and registered in .gitmodules. If no path is specified, the path is deduced from the repository specification.
+Add the given repository as a submodule at the given path to the changeset to be committed next. In particular, the repository is cloned at the specified path, added to the changeset and registered in .gitmodules. If no path is specified, the path is deduced from the repository specification. If the repository url begins with ./ or ../, it is stored as given but resolved as a relative path from the main project's url when cloning.
.TP
status
Show the status of the submodules. This will print the SHA\-1 of the currently checked out commit for each submodule, along with the submodule path and the output of \fBgit\-describe\fR(1) for the SHA\-1. Each SHA\-1 will be prefixed with \- if the submodule is not initialized and + if the currently checked out submodule commit does not match the SHA\-1 found in the index of the containing repository. This command is the default command for git\-submodule.
.\" 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 "GITATTRIBUTES" "5" "09/10/2007" "Git 1.5.3.1.40.g6972" "Git Manual"
+.TH "GITATTRIBUTES" "5" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
-\fBInteraction between checkin/checkout attributes\fR
-.RS 3
-In the check\-in codepath, the worktree file is first converted with ident (if specified), and then with crlf (again, if specified and applicable).
-
-In the check\-out codepath, the blob content is first converted with crlf, and then ident.
-.RE
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
\fBfilter\fR
.RS 3
A filter attribute can be set to a string value. This names filter driver specified in the configuration.
Missing filter driver definition in the config is not an error but makes the filter a no\-op passthru.
-The content filtering is done to massage the content into a shape that is more convenient for the platform, filesystem, and the user to use. The keyword here is "more convenient" and not "turning something unusable into usable". In other words, it is "hanging yourself because we gave you a long rope" if your project uses filtering mechanism in such a way that it makes your project unusable unless the checkout is done with a specific filter in effect.
+The content filtering is done to massage the content into a shape that is more convenient for the platform, filesystem, and the user to use. The keyword here is "more convenient" and not "turning something unusable into usable". In other words, the intent is that if someone unsets the filter driver definition, or does not have the appropriate filter program, the project should still be usable.
.RE
.sp
.it 1 an-trap
.\" 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 "GITIGNORE" "5" "07/22/2007" "Git 1.5.3.rc2.29.gc4640" "Git Manual"
+.TH "GITIGNORE" "5" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Patterns read from the command line for those commands that support them.
.TP
\(bu
-Patterns read from a .gitignore file in the same directory as the path, or in any parent directory, with patterns in the higher level files (up to the root) being overriden by those in lower level files down to the directory containing the file. These patterns match relative to the location of the .gitignore file. A project normally includes such .gitignore files in its repository, containing patterns for files generated as part of the project build.
+Patterns read from a .gitignore file in the same directory as the path, or in any parent directory, with patterns in the higher level files (up to the root) being overridden by those in lower level files down to the directory containing the file. These patterns match relative to the location of the .gitignore file. A project normally includes such .gitignore files in its repository, containing patterns for files generated as part of the project build.
.TP
\(bu
Patterns read from $GIT_DIR/info/exclude.
projects / git.git / commitdiff