From ab919c8fb0038505f150ef4e61dd87fae1e6e02a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 Apr 2007 18:30:38 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.2-rc0-95-ga0715 --- man1/git-blame.1 | 7 +++-- man1/git-commit-tree.1 | 4 ++- man1/git-config.1 | 4 +-- man1/git-shortlog.1 | 10 +++---- man1/git-svn.1 | 5 +++- man5/gitattributes.5 | 59 ++++++++++++++++++++++++++++++++++++++++-- man7/git.7 | 4 +-- 7 files changed, 78 insertions(+), 15 deletions(-) diff --git a/man1/git-blame.1 b/man1/git-blame.1 index 6c015ce33..157f4749d 100644 --- a/man1/git-blame.1 +++ b/man1/git-blame.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\-BLAME" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual" +.TH "GIT\-BLAME" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-blame \- Show what revision and author last modified each line of a file .SH "SYNOPSIS" .sp .nf -\fIgit\-blame\fR [\-c] [\-l] [\-t] [\-f] [\-n] [\-p] [\-\-incremental] [\-L n,m] +\fIgit\-blame\fR [\-c] [\-b] [\-\-root] [\-s] [\-l] [\-t] [\-f] [\-n] [\-p] [\-\-incremental] [\-L n,m] [\-S ] [\-M] [\-C] [\-C] [\-\-since=] [ | \-\-contents ] [\-\-] .fi @@ -113,6 +113,9 @@ Show filename in the original commit. By default filename is shown if there is a .TP \-n, \-\-show\-number Show line number in the original commit (Default: off). +.TP +\-s +Suppress author name and timestamp from the output. .SH "THE PORCELAIN FORMAT" In this format, each line is output after a header; the header at the minimum has the first line which has: .TP 3 diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 3158fa084..01144a94c 100644 --- a/man1/git-commit-tree.1 +++ b/man1/git-commit-tree.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\-COMMIT\-TREE" "1" "04/22/2007" "" "" +.TH "GIT\-COMMIT\-TREE" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -48,6 +48,8 @@ GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL +GIT_COMMITTER_DATE +EMAIL .fi (nb "<", ">" and "\\n"s are stripped) diff --git a/man1/git-config.1 b/man1/git-config.1 index 8cd3e8e2c..456bf89c1 100644 --- a/man1/git-config.1 +++ b/man1/git-config.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\-CONFIG" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual" +.TH "GIT\-CONFIG" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -519,7 +519,7 @@ tar.umask By default, \fBgit\-tar\-tree\fR(1) sets file and directories modes to 0666 or 0777. While this is both useful and acceptable for projects such as the Linux Kernel, it might be excessive for other projects. With this variable, it becomes possible to tell \fBgit\-tar\-tree\fR(1) to apply a specific umask to the modes above. The special value "user" indicates that the user's current umask will be used. This should be enough for most projects, as it will lead to the same permissions as \fBgit\-checkout\fR(1) would use. The default value remains 0, which means world read\-write. .TP user.email -Your email address to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_EMAIL\fR and \fIGIT_COMMITTER_EMAIL\fR environment variables. See \fBgit\-commit\-tree\fR(1). +Your email address to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_EMAIL\fR, \fIGIT_COMMITTER_EMAIL\fR, and \fIEMAIL\fR environment variables. See \fBgit\-commit\-tree\fR(1). .TP user.name Your full name to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_NAME\fR and \fIGIT_COMMITTER_NAME\fR environment variables. See \fBgit\-commit\-tree\fR(1). diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1 index 387b0eb91..02a841ba0 100644 --- a/man1/git-shortlog.1 +++ b/man1/git-shortlog.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\-SHORTLOG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-SHORTLOG" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -13,7 +13,7 @@ git\-shortlog \- Summarize 'git log' output .sp .nf git\-log \-\-pretty=short | \fIgit\-shortlog\fR [\-h] [\-n] [\-s] -git\-shortlog [\-n|\-\-number] [\-s|\-\-summary] [\&...] +git\-shortlog [\-n|\-\-numbered] [\-s|\-\-summary] [\&...] .fi .SH "DESCRIPTION" Summarizes \fIgit log\fR output in a format suitable for inclusion in release announcements. Each commit will be grouped by author and the first line of the commit message will be shown. @@ -21,13 +21,13 @@ Summarizes \fIgit log\fR output in a format suitable for inclusion in release an Additionally, "[PATCH]" will be stripped from the commit description. .SH "OPTIONS" .TP -\-h +\-h, \-\-help Print a short usage message and exit. .TP -\-n +\-n, \-\-numbered Sort output according to the number of commits per author instead of author alphabetic order. .TP -\-s +\-s, \-\-summary Suppress commit description and provide a commit count summary only. .SH "FILES" Example\ 1.\ mailmap::.sp diff --git a/man1/git-svn.1 b/man1/git-svn.1 index 0ac2bdf08..5a79e26cc 100644 --- a/man1/git-svn.1 +++ b/man1/git-svn.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\-SVN" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-SVN" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -99,6 +99,9 @@ our version of \-\-pretty=oneline .IP Any other arguments are passed directly to `git log' .TP +\fIfind\-rev\fR +When given an SVN revision number of the form \fIrN\fR, returns the corresponding git commit hash. When given a tree\-ish, returns the corresponding SVN revision number. +.TP \fIset\-tree\fR You should consider using \fIdcommit\fR instead of this command. Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up\-to\-date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of git\-svn functions. .TP diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index 65ea17cbc..506d7f700 100644 --- a/man5/gitattributes.5 +++ b/man5/gitattributes.5 @@ -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 "GITATTRIBUTES" "5" "04/25/2007" "Git 1.5.2.rc0.34.gda94" "Git Manual" +.TH "GITATTRIBUTES" "5" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -43,7 +43,15 @@ Sometimes you would need to override an setting of an attribute for a path to un .SH "EFFECTS" Certain operations by git can be influenced by assigning particular attributes to a path. Currently, three operations are attributes\-aware. .SS "Checking\-out and checking\-in" -The attribute crlf affects how the contents stored in the repository are copied to the working tree files when commands such as git checkout and git merge run. It also affects how git stores the contents you prepare in the working tree in the repository upon git add and git commit. +These attributes affect how the contents stored in the repository are copied to the working tree files when commands such as git checkout and git merge run. They also affect how git stores the contents you prepare in the working tree in the repository upon git add and git commit. +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +\fBcrlf\fR +.RS 3 +This attribute controls the line\-ending convention. .TP Set Setting the crlf attribute on a path is meant to mark the path as a "text" file. \fIcore.autocrlf\fR conversion takes place without guessing the content type by inspection. @@ -58,6 +66,7 @@ Set to string value "input" This is similar to setting the attribute to true, but also forces git to act as if core.autocrlf is set to input for the path. Any other value set to crlf attribute is ignored and git acts as if the attribute is left unspecified. +.RE .sp .it 1 an-trap .nr an-no-space-flag 1 @@ -71,6 +80,52 @@ When core.autocrlf is true, it means that the platform wants CRLF line endings f When core.autocrlf is set to "input", line endings are converted to LF upon checkin, but there is no conversion done upon checkout. .RE +.sp +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +\fBident\fR +.RS 3 +When the attribute ident is set to a path, git replaces $ident$ in the blob object with $ident:, followed by 40\-character hexadecimal blob object name, followed by a dollar sign $ upon checkout. Any byte sequence that begins with $ident: and ends with $ in the worktree file is replaced with $ident$ upon check\-in. +.RE +.sp +.it 1 an-trap +.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. + +A filter driver consists of clean command and smudge command, either of which can be left unspecified. Upon checkout, when smudge command is specified, the command is fed the blob object from its standard input, and its standard output is used to update the worktree file. Similarly, clean command is used to convert the contents of worktree file upon checkin. + +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. +.RE +.sp +.it 1 an-trap +.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 filter driver (if specified and corresponding driver defined), then the result is processed with ident (if specified), and then finally with crlf (again, if specified and applicable). + +In the check\-out codepath, the blob content is first converted with crlf, and then ident and fed to filter. +.RE .SS "Generating diff text" The attribute diff affects if git diff generates textual patch for the path or just says Binary files differ. .TP diff --git a/man7/git.7 b/man7/git.7 index 84c2ad2ab..3a96d14d4 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -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" "7" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT" "7" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -539,7 +539,7 @@ Due to the immutable nature of git objects, old objects can be archived into sha If the \fIGIT_DIR\fR environment variable is set then it specifies a path to use instead of the default .git for the base of the repository. .SS "git Commits" .TP -\fIGIT_AUTHOR_NAME\fR , \fIGIT_AUTHOR_EMAIL\fR , \fIGIT_AUTHOR_DATE\fR , \fIGIT_COMMITTER_NAME\fR , \fIGIT_COMMITTER_EMAIL\fR +\fIGIT_AUTHOR_NAME\fR , \fIGIT_AUTHOR_EMAIL\fR , \fIGIT_AUTHOR_DATE\fR , \fIGIT_COMMITTER_NAME\fR , \fIGIT_COMMITTER_EMAIL\fR , \fIGIT_COMMITTER_DATE\fR , \fIEMAIL\fR see \fBgit\-commit\-tree\fR(1) .SS "git Diffs" .TP -- 2.26.2