From: Junio C Hamano Date: Sun, 27 May 2007 04:29:16 +0000 (+0000) Subject: Autogenerated manpages for v1.5.2-86-g99b5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae09c313c18aa01c19c7b0ce1a7d6599fa9635c5;p=git.git Autogenerated manpages for v1.5.2-86-g99b5 --- diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index 70cb95a46..f225c52b4 100644 --- a/man1/git-ls-files.1 +++ b/man1/git-ls-files.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\-LS\-FILES" "1" "05/08/2007" "Git 1.5.2.rc2.21.g3082" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "05/27/2007" "Git 1.5.2.86.g99b5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -133,7 +133,7 @@ show files just outputs the filename unless \fI\-\-stage\fR is specified in whic .fi "git\-ls\-files \-\-unmerged" and "git\-ls\-files \-\-stage" can be used to examine detailed information on unmerged paths. -For an unmerged path, instead of recording a single mode/SHA1 pair, the dircache records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see git\-read\-tree for more information on state) +For an unmerged path, instead of recording a single mode/SHA1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see git\-read\-tree for more information on state) When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively. .SH "EXCLUDE PATTERNS"