From ac0e1e23221ea748d9c1ec34aaba7efd02675944 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 Feb 2007 08:14:11 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0.2-230-gfbe3d --- man1/git-cvsimport.1 | 16 +++++++--------- man1/git-diff-files.1 | 7 +++++-- man1/git-diff.1 | 8 +++++++- man1/git-show.1 | 14 ++++++++------ man7/git.7 | 2 +- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index 8a44e3966..1cc9d56e3 100644 --- a/man1/git-cvsimport.1 +++ b/man1/git-cvsimport.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\-CVSIMPORT" "1" "01/19/2007" "" "" +.TH "GIT\-CVSIMPORT" "1" "02/28/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -73,9 +73,6 @@ Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to \-s Substitute the character "/" in branch names with .TP -\-A -CVS by default uses the Unix username when writing its commit logs. Using this option and an author\-conv\-file in this format -.TP \-a Import all commits, including recent ones. cvsimport by default skips commits that have a timestamp less than 10 minutes ago. .TP @@ -84,18 +81,19 @@ Skip paths matching the regex. .TP \-L Limit the number of commits imported. Workaround for cases where cvsimport leaks memory. - -+ +.TP +\-A +CVS by default uses the Unix username when writing its commit logs. Using this option and an author\-conv\-file in this format .sp .nf exon=Andreas Ericsson spawn=Simon Pawn .fi -+ git\-cvsimport will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. +git\-cvsimport will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. -+ For convenience, this data is saved to $GIT_DIR/cvs\-authors each time the \-A option is provided and read from that same file each time git\-cvsimport is run. +For convenience, this data is saved to $GIT_DIR/cvs\-authors each time the \-A option is provided and read from that same file each time git\-cvsimport is run. -+ It is not recommended to use this feature if you intend to export changes back to CVS again later with \fBgit\-cvsexportcommit\fR(1). +It is not recommended to use this feature if you intend to export changes back to CVS again later with \fBgit\-cvsexportcommit\fR(1). .SH "OUTPUT" If \fI\-v\fR is specified, the script reports what it is doing. diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 8d568bcbf..10817bb90 100644 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-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\-DIFF\-FILES" "1" "02/14/2007" "" "" +.TH "GIT\-DIFF\-FILES" "1" "02/28/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-diff\-files \- Compares files in the working tree and the index .SH "SYNOPSIS" -\fIgit\-diff\-files\fR [\-q] [\-0|\-1|\-2|\-3|\-c|\-\-cc] [] [\&...] +\fIgit\-diff\-files\fR [\-q] [\-0|\-1|\-2|\-3|\-c|\-\-cc|\-n|\-\-no\-index] [] [\&...] .SH "DESCRIPTION" Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the same as "git\-diff\-index" and "git\-diff\-tree". .SH "OPTIONS" @@ -139,6 +139,9 @@ The default is to diff against our branch (\-2) and the cleanly resolved paths. \-c,\-\-cc This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way \fIdiff\-tree\fR shows a merge commit with these flags. .TP +\\\-n,\-\-no\-index +Compare the two given files / directories. +.TP \-q Remain silent even on nonexistent files .SH "OUTPUT FORMAT" diff --git a/man1/git-diff.1 b/man1/git-diff.1 index e51d79b62..b1dc30da2 100644 --- a/man1/git-diff.1 +++ b/man1/git-diff.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\-DIFF" "1" "02/14/2007" "" "" +.TH "GIT\-DIFF" "1" "02/28/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -16,6 +16,12 @@ Show changes between two trees, a tree and the working tree, a tree and the inde .TP \fIgit\-diff\fR [\-\-options] [\-\-] [\&...] This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell git to further add to the index but you still haven't. You can stage these changes by using \fBgit\-add\fR(1). +.sp +.nf +If exactly two paths are given, and at least one is untracked, +compare the two files / directories. This behavior can be +forced by \-\-no\-index. +.fi .TP \fIgit\-diff\fR [\-\-options] \-\-cached [] [\-\-] [\&...] This form is to view the changes you staged for the next commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. diff --git a/man1/git-show.1 b/man1/git-show.1 index ab3f4e73d..3214a43c0 100644 --- a/man1/git-show.1 +++ b/man1/git-show.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\-SHOW" "1" "02/19/2007" "" "" +.TH "GIT\-SHOW" "1" "02/28/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -134,12 +134,14 @@ The commit objects record the encoding used for the log message in their encodin git show v1.0.0 Shows the tag v1.0.0, along with the object the tags points at. .TP - +git show v1.0.0^{tree} Shows the tree pointed to by the tag v1.0.0. - -git show next~10:Documentation/README Shows the contents of the file Documentation/README as they were current in the 10th last commit of the branch next. - -git show master:Makefile master:t/Makefile Concatenates the contents of said Makefiles in the head of the branch master. +.TP +git show next~10:Documentation/README +Shows the contents of the file Documentation/README as they were current in the 10th last commit of the branch next. +.TP +git show master:Makefile master:t/Makefile +Concatenates the contents of said Makefiles in the head of the branch master. .SH "DISCUSSION" At the core level, git is character encoding agnostic. .TP 3 diff --git a/man7/git.7 b/man7/git.7 index 437962a47..a67ebbb81 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" "02/26/2007" "" "" +.TH "GIT" "7" "02/28/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2