From da0e8b5bb8ba17678131eb12dc7d654468c0acd8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 26 Dec 2006 09:12:10 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0-rc0-g6934 --- man1/git-apply.1 | 73 +++++++++++------------------------------- man1/git-diff-files.1 | 4 +-- man1/git-diff-index.1 | 4 +-- man1/git-diff-stages.1 | 4 +-- man1/git-diff-tree.1 | 4 +-- man1/git-diff.1 | 4 +-- man1/git-reset.1 | 14 +++++--- man1/git-show-branch.1 | 6 +++- 8 files changed, 44 insertions(+), 69 deletions(-) diff --git a/man1/git-apply.1 b/man1/git-apply.1 index ad2da7f0b..1ab3b4c0e 100644 --- a/man1/git-apply.1 +++ b/man1/git-apply.1 @@ -2,7 +2,7 @@ .\" 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" "11/18/2006" "" "" +.TH "GIT\-APPLY" "1" "12/26/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -20,19 +20,16 @@ git\-apply \- Apply patch on a git index file and a work tree .fi .SH "DESCRIPTION" Reads supplied diff output and applies it on a git index file and a work tree. -.sp .SH "OPTIONS" .TP \&... -The files to read patch from. -\fI\-\fR -can be used to read from the standard input. +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". .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. For binary files, outputs two \- instead of saying 0 0. 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". @@ -44,27 +41,19 @@ Instead of applying the patch, see if the patch is applicable to the current wor 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. .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 Remove leading slashes from traditional diff paths. The default is 1. @@ -73,23 +62,15 @@ Remove leading slashes from traditional diff paths. The default is 1. Ensure at least 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 \-\-unidiff\-zero -By default, -\fBgit\-apply\fR(1) -expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with \-\-unified=0. To bypass these checks use -\fI\-\-unidiff\-zero\fR. -.sp +By default, \fBgit\-apply\fR(1) expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with \-\-unified=0. To bypass these checks use \fI\-\-unidiff\-zero\fR. + Note, for the reasons stated above usage of context\-free patches are discouraged. .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 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. @@ -98,35 +79,23 @@ Historically we did not allow binary patch applied without an explicit permissio 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=