-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GIT-APPLY" 1 "" "" ""
-.SH NAME
-git-apply \- Apply patch on a git index file and a work tree
+.\" ** 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\-APPLY" "1" "09/14/2006" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+git\-apply \- Apply patch on a git index file and a work tree
.SH "SYNOPSIS"
-
+.sp
.nf
\fIgit\-apply\fR [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply]
[\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement | \-\-binary]
[\-R | \-\-reverse] [\-\-reject] [\-z] [\-pNUM] [\-CNUM] [\-\-inaccurate\-eof]
[\-\-whitespace=<nowarn|warn|error|error\-all|strip>] [\-\-exclude=PATH]
- [\-\-cached] [\-\-verbose] [<patch>...]
+ [\-\-cached] [\-\-verbose] [<patch>\&...]
.fi
-
.SH "DESCRIPTION"
-
-
-Reads supplied diff output and applies it on a git index file and a work tree\&.
-
+Reads supplied diff output and applies it on a git index file and a work tree.
+.sp
.SH "OPTIONS"
-
.TP
-<patch>...
-The files to read patch from\&. \fI\-\fR can be used to read from the standard input\&.
-
+<patch>\&...
+The files to read patch from.
+\fI\-\fR
+can be used to read from the standard input.
.TP
\-\-stat
-Instead of applying the patch, output diffstat for the input\&. Turns off "apply"\&.
-
+Instead of applying the patch, output diffstat for the input. Turns off "apply".
.TP
\-\-numstat
-Similar to \-\-stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly\&. Turns off "apply"\&.
-
+Similar to \-\-stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. Turns off "apply".
.TP
\-\-summary
-Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes\&. Turns off "apply"\&.
-
+Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes. Turns off "apply".
.TP
\-\-check
-Instead of applying the patch, see if the patch is applicable to the current work tree and/or the index file and detects errors\&. Turns off "apply"\&.
-
+Instead of applying the patch, see if the patch is applicable to the current work tree and/or the index file and detects errors. Turns off "apply".
.TP
\-\-index
-When \-\-check is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records\&. If the file to be patched in the work tree is not up\-to\-date, it is flagged as an error\&. This flag also causes the index file to be updated\&.
-
+When \-\-check is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records. If the file to be patched in the work tree is not up\-to\-date, it is flagged as an error. This flag also causes the index file to be updated.
.TP
\-\-cached
-Apply a patch without touching the working tree\&. Instead, take the cached data, apply the patch, and store the result in the index, without using the working tree\&. This implies \fI\-\-index\fR\&.
-
+Apply a patch without touching the working tree. Instead, take the cached data, apply the patch, and store the result in the index, without using the working tree. This implies
+\fI\-\-index\fR.
.TP
\-\-index\-info
-Newer git\-diff output has embedded \fIindex information\fR for each blob to help identify the original version that the patch applies to\&. When this flag is given, and if the original version of the blob is available locally, outputs information about them to the standard output\&.
-
+Newer git\-diff output has embedded
+\fIindex information\fR
+for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original version of the blob is available locally, outputs information about them to the standard output.
.TP
\-R, \-\-reverse
-Apply the patch in reverse\&.
-
+Apply the patch in reverse.
.TP
\-\-reject
-For atomicity, \fBgit\-apply\fR(1) by default fails the whole patch and does not touch the working tree when some of the hunks do not apply\&. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *\&.rej files\&.
-
+For atomicity,
+\fBgit\-apply\fR(1)
+by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files.
.TP
\-z
-When showing the index information, do not munge paths, but use NUL terminated machine readable format\&. Without this flag, the pathnames output will have TAB, LF, and backslash characters replaced with \\t, \\n, and \\\\, respectively\&.
-
+When showing the index information, do not munge paths, but use NUL terminated machine readable format. Without this flag, the pathnames output will have TAB, LF, and backslash characters replaced with
+\\t,
+\\n, and
+\\\\, respectively.
.TP
\-p<n>
-Remove <n> leading slashes from traditional diff paths\&. The default is 1\&.
-
+Remove <n> leading slashes from traditional diff paths. The default is 1.
.TP
\-C<n>
-Ensure at least <n> lines of surrounding context match before and after each change\&. When fewer lines of surrounding context exist they all must match\&. By default no context is ever ignored\&.
-
+Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored.
.TP
\-\-apply
-If you use any of the options marked "Turns off \fIapply\fR" above, \fBgit\-apply\fR(1) reads and outputs the information you asked without actually applying the patch\&. Give this flag after those flags to also apply the patch\&.
-
+If you use any of the options marked "Turns off
+\fIapply\fR" above,
+\fBgit\-apply\fR(1)
+reads and outputs the information you asked without actually applying the patch. Give this flag after those flags to also apply the patch.
.TP
\-\-no\-add
-When applying a patch, ignore additions made by the patch\&. This can be used to extract common part between two files by first running diff on them and applying the result with this option, which would apply the deletion part but not addition part\&.
-
+When applying a patch, ignore additions made by the patch. This can be used to extract common part between two files by first running
+diff
+on them and applying the result with this option, which would apply the deletion part but not addition part.
.TP
\-\-allow\-binary\-replacement, \-\-binary
-When applying a patch, which is a git\-enhanced patch that was prepared to record the pre\- and post\-image object name in full, and the path being patched exactly matches the object the patch applies to (i\&.e\&. "index" line's pre\-image object name is what is in the working tree), and the post\-image object is available in the object database, use the post\-image object as the patch result\&. This allows binary files to be patched in a very limited way\&.
-
+Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary patch application, so this is a no\-op.
.TP
\-\-exclude=<path\-pattern>
-Don't apply changes to files matching the given path pattern\&. This can be useful when importing patchsets, where you want to exclude certain files or directories\&.
-
+Don't apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to exclude certain files or directories.
.TP
\-\-whitespace=<option>
-When applying a patch, detect a new or modified line that ends with trailing whitespaces (this includes a line that solely consists of whitespaces)\&. By default, the command outputs warning messages and applies the patch\&. When \fBgit\-apply\fR(1) is used for statistics and not applying a patch, it defaults to nowarn\&. You can use different <option> to control this behavior:
-
+When applying a patch, detect a new or modified line that ends with trailing whitespaces (this includes a line that solely consists of whitespaces). By default, the command outputs warning messages and applies the patch. When
+\fBgit\-apply\fR(1)
+is used for statistics and not applying a patch, it defaults to
+nowarn. You can use different
+<option>
+to control this behavior:
.RS
.TP 3
\(bu
- nowarn turns off the trailing whitespace warning\&.
+nowarn
+turns off the trailing whitespace warning.
.TP
\(bu
- warn outputs warnings for a few such errors, but applies the patch (default)\&.
+warn
+outputs warnings for a few such errors, but applies the patch (default).
.TP
\(bu
- error outputs warnings for a few such errors, and refuses to apply the patch\&.
+error
+outputs warnings for a few such errors, and refuses to apply the patch.
.TP
\(bu
- error\-all is similar to error but shows all errors\&.
+error\-all
+is similar to
+error
+but shows all errors.
.TP
\(bu
- strip outputs warnings for a few such errors, strips out the trailing whitespaces and applies the patch\&.
-.LP
+strip
+outputs warnings for a few such errors, strips out the trailing whitespaces and applies the patch.
.RE
-.IP
-
.TP
\-\-inacurate\-eof
-Under certain circumstances, some versions of diff do not correctly detect a missing new\-line at the end of the file\&. As a result, patches created by such diff programs do not record incomplete lines correctly\&. This option adds support for applying such patches by working around this bug\&.
-
+Under certain circumstances, some versions of diff do not correctly detect a missing new\-line at the end of the file. As a result, patches created by such diff programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug.
.TP
\-\-verbose
-Report progress to stderr\&. By default, only a message about the current patch being applied will be printed\&. This option will cause additional information to be reported\&.
-
+Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported.
.SH "CONFIGURATION"
-
.TP
-apply\&.whitespace
-When no \-\-whitespace flag is given from the command line, this configuration item is used as the default\&.
-
+apply.whitespace
+When no
+\-\-whitespace
+flag is given from the command line, this configuration item is used as the default.
.SH "AUTHOR"
-
-
-Written by Linus Torvalds <torvalds@osdl\&.org>
-
+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
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GIT-UNPACK-OBJECTS" 1 "" "" ""
-.SH NAME
-git-unpack-objects \- Unpack objects from a packed archive
+.\" ** 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\-UNPACK\-OBJECTS" "1" "09/14/2006" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+git\-unpack\-objects \- Unpack objects from a packed archive
.SH "SYNOPSIS"
-
-
-\fIgit\-unpack\-objects\fR [\-n] [\-q] <pack\-file
-
+\fIgit\-unpack\-objects\fR [\-n] [\-q] [\-r] <pack\-file
+.sp
.SH "DESCRIPTION"
-
-
-Read a packed archive (\&.pack) from the standard input, expanding the objects contained within and writing them into the repository in "loose" (one object per file) format\&.
-
-
-Objects that already exist in the repository will \fInot\fR be unpacked from the pack\-file\&. Therefore, nothing will be unpacked if you use this command on a pack\-file that exists within the target repository\&.
-
-
-Please see the git\-repack documentation for options to generate new packs and replace existing ones\&.
-
+Read a packed archive (.pack) from the standard input, expanding the objects contained within and writing them into the repository in "loose" (one object per file) format.
+.sp
+Objects that already exist in the repository will \fBnot\fR be unpacked from the pack\-file. Therefore, nothing will be unpacked if you use this command on a pack\-file that exists within the target repository.
+.sp
+Please see the git\-repack documentation for options to generate new packs and replace existing ones.
+.sp
.SH "OPTIONS"
-
.TP
\-n
-Only list the objects that would be unpacked, don't actually unpack them\&.
-
+Only list the objects that would be unpacked, don't actually unpack them.
.TP
\-q
-The command usually shows percentage progress\&. This flag suppresses it\&.
-
+The command usually shows percentage progress. This flag suppresses it.
+.TP
+\-r
+When unpacking a corrupt packfile, the command dies at the first corruption. This flag tells it to keep going and make the best effort to recover as many objects as possible.
.SH "AUTHOR"
-
-
-Written by Linus Torvalds <torvalds@osdl\&.org>
-
+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