From 44dd7e0c2255bdc55b35659d14842c33edb35f5c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 3 Nov 2007 02:46:49 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3.5-529-ge3d6d --- man1/git-add.1 | 6 +- man1/git-branch.1 | 4 +- man1/git-diff-files.1 | 10 +- man1/git-diff-index.1 | 10 +- man1/git-diff-tree.1 | 10 +- man1/git-diff.1 | 236 ++++++++++++++++++++++++++++++++++++++- man1/git-filter-branch.1 | 4 +- man1/git-mv.1 | 4 +- man1/git-reset.1 | 4 +- man1/git-rm.1 | 6 +- man1/git-stripspace.1 | 4 +- man1/git-symbolic-ref.1 | 4 +- 12 files changed, 268 insertions(+), 34 deletions(-) diff --git a/man1/git-add.1 b/man1/git-add.1 index 6d132d949..e699956dd 100644 --- a/man1/git-add.1 +++ b/man1/git-add.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\-ADD" "1" "08/29/2007" "Git 1.5.3.rc7" "Git Manual" +.TH "GIT\-ADD" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -32,10 +32,10 @@ Please see \fBgit\-commit\fR(1) for alternative ways to add content to a commit. \&... Files to add content from. Fileglobs (e.g. *.c) can be given to add all matching files. Also a leading directory name (e.g. dir to add dir/file1 and dir/file2) can be given to add all files in the directory, recursively. .TP -\-n +\-n, \-\-dry\-run Don't actually add the file(s), just show if they exist. .TP -\-v +\-v, \-\-verbose Be verbose. .TP \-f diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 4d81fb2ad..d1dd559eb 100644 --- a/man1/git-branch.1 +++ b/man1/git-branch.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\-BRANCH" "1" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-BRANCH" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -62,7 +62,7 @@ List or delete (if used with \-d) the remote\-tracking branches. \-a List both remote\-tracking branches and local branches. .TP -\-v +\-v, \-\-verbose Show sha1 and commit subject line for each head. .TP \-\-abbrev= diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 661b1af46..6d8a3d018 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" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -163,7 +163,7 @@ Compare the two given files / directories. \-q Remain silent even on nonexistent files .SH "OUTPUT FORMAT" -The output format from "git\-diff\-index", "git\-diff\-tree" and "git\-diff\-files" are very similar. +The output format from "git\-diff\-index", "git\-diff\-tree", "git\-diff\-files" and "git diff \-\-raw" are very similar. These commands all compare two sets of things; what is compared differs: .TP @@ -251,7 +251,7 @@ Example: .fi When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively. .SH "DIFF FORMAT FOR MERGES" -"git\-diff\-tree" and "git\-diff\-files" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way: +"git\-diff\-tree", "git\-diff\-files" and "git\-diff \-\-raw" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way: .TP 3 1. there is a colon for each parent @@ -278,7 +278,7 @@ Example: .fi Note that \fIcombined diff\fR lists only files which were modified from all parents. .SH "GENERATING PATCHES WITH \-P" -When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. +When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, or "git diff" without the \fI\-\-raw\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. What the \-p option produces is slightly different from the traditional diff format. .TP 3 @@ -314,7 +314,7 @@ TAB, LF, double quote and backslash characters in pathnames are represented as \ The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one. .SH "COMBINED DIFF FORMAT" -git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: +"git\-diff\-tree", "git\-diff\-files" and "git\-diff" can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp .nf .ft C diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index e8bf8cfea..535ea7654 100644 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.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\-INDEX" "1" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -158,7 +158,7 @@ do not consider the on\-disk file at all \-m By default, files recorded in the index but not checked out are reported as deleted. This flag makes "git\-diff\-index" say that all non\-checked\-out files are up to date. .SH "OUTPUT FORMAT" -The output format from "git\-diff\-index", "git\-diff\-tree" and "git\-diff\-files" are very similar. +The output format from "git\-diff\-index", "git\-diff\-tree", "git\-diff\-files" and "git diff \-\-raw" are very similar. These commands all compare two sets of things; what is compared differs: .TP @@ -246,7 +246,7 @@ Example: .fi When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively. .SH "DIFF FORMAT FOR MERGES" -"git\-diff\-tree" and "git\-diff\-files" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way: +"git\-diff\-tree", "git\-diff\-files" and "git\-diff \-\-raw" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way: .TP 3 1. there is a colon for each parent @@ -273,7 +273,7 @@ Example: .fi Note that \fIcombined diff\fR lists only files which were modified from all parents. .SH "GENERATING PATCHES WITH \-P" -When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. +When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, or "git diff" without the \fI\-\-raw\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. What the \-p option produces is slightly different from the traditional diff format. .TP 3 @@ -309,7 +309,7 @@ TAB, LF, double quote and backslash characters in pathnames are represented as \ The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one. .SH "COMBINED DIFF FORMAT" -git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: +"git\-diff\-tree", "git\-diff\-files" and "git\-diff" can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp .nf .ft C diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index eb0ac0900..22087e523 100644 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-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\-DIFF\-TREE" "1" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -452,7 +452,7 @@ HEAD commits it finds, which is even more interesting. .fi in case you care). .SH "OUTPUT FORMAT" -The output format from "git\-diff\-index", "git\-diff\-tree" and "git\-diff\-files" are very similar. +The output format from "git\-diff\-index", "git\-diff\-tree", "git\-diff\-files" and "git diff \-\-raw" are very similar. These commands all compare two sets of things; what is compared differs: .TP @@ -540,7 +540,7 @@ Example: .fi When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively. .SH "DIFF FORMAT FOR MERGES" -"git\-diff\-tree" and "git\-diff\-files" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way: +"git\-diff\-tree", "git\-diff\-files" and "git\-diff \-\-raw" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way: .TP 3 1. there is a colon for each parent @@ -567,7 +567,7 @@ Example: .fi Note that \fIcombined diff\fR lists only files which were modified from all parents. .SH "GENERATING PATCHES WITH \-P" -When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. +When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, or "git diff" without the \fI\-\-raw\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. What the \-p option produces is slightly different from the traditional diff format. .TP 3 @@ -603,7 +603,7 @@ TAB, LF, double quote and backslash characters in pathnames are represented as \ The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one. .SH "COMBINED DIFF FORMAT" -git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: +"git\-diff\-tree", "git\-diff\-files" and "git\-diff" can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp .nf .ft C diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 7dbcf5fd9..f82e62c1e 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" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" +.TH "GIT\-DIFF" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -175,6 +175,240 @@ For more detailed explanation on these common options, see also [1]\&\fIdiffcore .TP \&... The parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them). +.SH "OUTPUT FORMAT" +The output format from "git\-diff\-index", "git\-diff\-tree", "git\-diff\-files" and "git diff \-\-raw" are very similar. + +These commands all compare two sets of things; what is compared differs: +.TP +git\-diff\-index +compares the and the files on the filesystem. +.TP +git\-diff\-index \-\-cached +compares the and the index. +.TP +git\-diff\-tree [\-r] [\&...] +compares the trees named by the two arguments. +.TP +git\-diff\-files [\&...] +compares the index and the files on the filesystem. + +An output line is formatted this way: +.sp +.nf +.ft C +in\-place edit :100644 100644 bcd1234... 0123456... M file0 +copy\-edit :100644 100644 abcd123... 1234567... C68 file1 file2 +rename\-edit :100644 100644 abcd123... 1234567... R86 file1 file3 +create :000000 100644 0000000... 1234567... A file4 +delete :100644 000000 1234567... 0000000... D file5 +unmerged :000000 000000 0000000... 0000000... U file6 +.ft + +.fi +That is, from the left to the right: +.TP 3 +1. +a colon. +.TP +2. +mode for "src"; 000000 if creation or unmerged. +.TP +3. +a space. +.TP +4. +mode for "dst"; 000000 if deletion or unmerged. +.TP +5. +a space. +.TP +6. +sha1 for "src"; 0{40} if creation or unmerged. +.TP +7. +a space. +.TP +8. +sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree". +.TP +9. +a space. +.TP +10. +status, followed by optional "score" number. +.TP +11. +a tab or a NUL when \fI\-z\fR option is used. +.TP +12. +path for "src" +.TP +13. +a tab or a NUL when \fI\-z\fR option is used; only exists for C or R. +.TP +14. +path for "dst"; only exists for C or R. +.TP +15. +an LF or a NUL when \fI\-z\fR option is used, to terminate the record. + + is shown as all 0's if a file is new on the filesystem and it is out of sync with the index. + +Example: +.sp +.nf +.ft C +:100644 100644 5be4a4...... 000000...... M file.c +.ft + +.fi +When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively. +.SH "DIFF FORMAT FOR MERGES" +"git\-diff\-tree", "git\-diff\-files" and "git\-diff \-\-raw" can take \fI\-c\fR or \fI\-\-cc\fR option to generate diff output also for merge commits. The output differs from the format described above in the following way: +.TP 3 +1. +there is a colon for each parent +.TP +2. +there are more "src" modes and "src" sha1 +.TP +3. +status is concatenated status characters for each parent +.TP +4. +no optional "score" number +.TP +5. +single path, only for "dst" + +Example: +.sp +.nf +.ft C +::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c +.ft + +.fi +Note that \fIcombined diff\fR lists only files which were modified from all parents. +.SH "GENERATING PATCHES WITH \-P" +When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, or "git diff" without the \fI\-\-raw\fR option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. + +What the \-p option produces is slightly different from the traditional diff format. +.TP 3 +1. +It is preceded with a "git diff" header, that looks like this: +.sp +.nf +diff \-\-git a/file1 b/file2 +.fi +The a/ and b/ filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, /dev/null is _not_ used in place of a/ or b/ filenames. + +When rename/copy is involved, file1 and file2 show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively. +.TP +2. +It is followed by one or more extended header lines: +.sp +.nf +old mode +new mode +deleted file mode +new file mode +copy from +copy to +rename from +rename to +similarity index +dissimilarity index +index .. +.fi +.TP +3. +TAB, LF, double quote and backslash characters in pathnames are represented as \\t, \\n, \\" and \\\\, respectively. If there is need for such substitution then the whole pathname is put in double quotes. + +The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one. +.SH "COMBINED DIFF FORMAT" +"git\-diff\-tree", "git\-diff\-files" and "git\-diff" can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: +.sp +.nf +.ft C +diff \-\-combined describe.c +index fabadb8,cc95eb0..4866510 +\-\-\- a/describe.c ++++ b/describe.c +@@@ \-98,20 \-98,12 +98,20 @@@ + return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1; + } + +\- static void describe(char *arg) + \-static void describe(struct commit *cmit, int last_one) +++static void describe(char *arg, int last_one) + { + + unsigned char sha1[20]; + + struct commit *cmit; + struct commit_list *list; + static int initialized = 0; + struct commit_name *n; + + + if (get_sha1(arg, sha1) < 0) + + usage(describe_usage); + + cmit = lookup_commit_reference(sha1); + + if (!cmit) + + usage(describe_usage); + + + if (!initialized) { + initialized = 1; + for_each_ref(get_name); +.ft + +.fi +.TP 3 +1. +It is preceded with a "git diff" header, that looks like this (when \fI\-c\fR option is used): +.sp +.nf +diff \-\-combined file +.fi +or like this (when \fI\-\-cc\fR option is used): +.sp +.nf +diff \-\-c file +.fi +.TP +2. +It is followed by one or more extended header lines (this example shows a merge with two parents): +.sp +.nf +index ,.. +mode ,.. +new file mode +deleted file mode , +.fi +The mode ,.. line appears only if at least one of the is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two and are not used by combined diff format. +.TP +3. +It is followed by two\-line from\-file/to\-file header +.sp +.nf +\-\-\- a/file ++++ b/file +.fi +Similar to two\-line header for traditional \fIunified\fR diff format, /dev/null is used to signal created or deleted files. +.TP +4. +Chunk header format is modified to prevent people from accidentally feeding it to patch \-p1. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended \fIindex\fR header: +.sp +.nf +@@@ @@@ +.fi +There are (number of parents + 1) @ characters in the chunk header for combined diff format. + +Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus \(em appears in A but removed in B), + (plus \(em missing in A but added to B), or " " (space \(em unchanged) prefix, this format compares two or more files file1, file2,\&... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it. + +A \- character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the last file, and fileN does not have that line (in other words, the line was added, from the point of view of that parent). + +In the above example output, the function signature was changed from both files (hence two \- removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same from file1 but do not appear in file2 (hence prefixed with +). + +When shown by git diff\-tree \-c, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by git diff\-files \-c, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version"). .SH "EXAMPLES" .TP Various ways to check your working tree diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index 9dc228ec6..34dedf16e 100644 --- a/man1/git-filter-branch.1 +++ b/man1/git-filter-branch.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\-FILTER\-BRANCH" "1" "11/02/2007" "Git 1.5.3.5.474.g3e4bb" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -73,7 +73,7 @@ Use this option to set the namespace where the original commits will be stored. \-d Use this option to set the path to the temporary directory used for rewriting. When applying a tree filter, the command needs to temporary checkout the tree to some directory, which may consume considerable space in case of large projects. By default it does this in the \fI.git\-rewrite/\fR directory but you can override that choice by this parameter. .TP -\-f\\|\-\-force +\-f|\-\-force git filter\-branch refuses to start with an existing temporary directory or when there are already refs starting with \fIrefs/original/\fR, unless forced. .TP diff --git a/man1/git-mv.1 b/man1/git-mv.1 index 5852d5533..be7500304 100644 --- a/man1/git-mv.1 +++ b/man1/git-mv.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\-MV" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-MV" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -29,7 +29,7 @@ Force renaming or moving of a file even if the target exists \-k Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by GIT, or when it would overwrite an existing file unless \fI\-f\fR is given. .TP -\-n +\-n, \-\-dry\-run Do nothing; only show what would happen .SH "AUTHOR" Written by Linus Torvalds Rewritten by Ryan Anderson Move functionality added by Josef Weidendorfer diff --git a/man1/git-reset.1 b/man1/git-reset.1 index de69eaf3e..3106b60f3 100644 --- a/man1/git-reset.1 +++ b/man1/git-reset.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\-RESET" "1" "08/02/2007" "Git 1.5.3.rc3.120.g68d422" "Git Manual" +.TH "GIT\-RESET" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -145,7 +145,7 @@ Suppose you are interrupted by an urgent fix request while you are in the middle .ft C $ git checkout feature ;# you were working in "feature" branch and $ work work work ;# got interrupted -$ git commit \-a \-m 'snapshot WIP' \fB(1)\fR +$ git commit \-a \-m "snapshot WIP" \fB(1)\fR $ git checkout master $ fix fix fix $ git commit ;# commit with real log diff --git a/man1/git-rm.1 b/man1/git-rm.1 index 7773ca160..5d95a80c5 100644 --- a/man1/git-rm.1 +++ b/man1/git-rm.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\-RM" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-RM" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -21,7 +21,7 @@ Files to remove. Fileglobs (e.g. *.c) can be given to remove all matching files. \-f Override the up\-to\-date check. .TP -\-n +\-n, \-\-dry\-run Don't actually remove the file(s), just show if they exist in the index. .TP \-r @@ -36,7 +36,7 @@ This option can be used to tell the command to remove the paths only from the in \-\-ignore\-unmatch Exit with a zero status even if no files matched. .TP -\-\-quiet +\-q, \-\-quiet git\-rm normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output. .SH "DISCUSSION" The list of given to the command can be exact pathnames, file glob patterns, or leading directory name. The command removes only the paths that is known to git. Giving the name of a file that you have not told git about does not remove that file. diff --git a/man1/git-stripspace.1 b/man1/git-stripspace.1 index 49504a186..9162b3082 100644 --- a/man1/git-stripspace.1 +++ b/man1/git-stripspace.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\-STRIPSPACE" "1" "08/11/2007" "Git 1.5.3.rc4.67.gf9286" "Git Manual" +.TH "GIT\-STRIPSPACE" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,7 +15,7 @@ git\-stripspace \- Filter out empty lines Remove multiple empty lines, and empty lines at beginning and end. .SH "OPTIONS" .TP -\-s\\|\-\-strip\-comments +\-s|\-\-strip\-comments In addition to empty lines, also strip lines starting with \fI#\fR. .TP diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1 index 3633c5a63..3fdc77006 100644 --- a/man1/git-symbolic-ref.1 +++ b/man1/git-symbolic-ref.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\-SYMBOLIC\-REF" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-SYMBOLIC\-REF" "1" "11/03/2007" "Git 1.5.3.5.529.ge3d6d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -19,7 +19,7 @@ Give two arguments, create or update a symbolic ref to point at the given A symbolic ref is a regular file that stores a string that begins with ref: refs/. For example, your .git/HEAD is a regular file whose contents is ref: refs/heads/master. .SH "OPTIONS" .TP -\-q +\-q, \-\-quiet Do not issue an error message if the is not a symbolic ref but a detached HEAD; instead exit with non\-zero status silently. .TP \-m -- 2.26.2