Autogenerated man pages for v1.3.0-rc2-gae5d

diff --git a/man1/git-commit.1 b/man1/git-commit.1
index 098c3ef7e8e2f33d2472207f669151d4b0e7a84d..479600ae64ac83cb44df0a7b54b6b628d870373d 100755 (executable)
--- a/man1/git-commit.1
+++ b/man1/git-commit.1
@@ -24,7 +24,8 @@ git-commit \- Record your changes
 
 .nf
 \fIgit\-commit\fR [\-a] [\-s] [\-v] [(\-c | \-C) <commit> | \-F <file> | \-m <msg>]
-           [\-e] [\-\-author <author>] [\-\-] [[\-i | \-o ]<file>...]
+           [\-\-no\-verify] [\-\-amend] [\-e] [\-\-author <author>]
+           [\-\-] [[\-i | \-o ]<file>...]
 .fi
 
 .SH "DESCRIPTION"
@@ -76,6 +77,20 @@ The opposite of \-\-verify\&.
 \-e|\-\-edit
 The message taken from file with \-F, command line with \-m, and from file with \-C are usually used as the commit log message unmodified\&. This option lets you further edit the message taken from these sources\&.
 
+.TP
+\-\-amend
+Used to amend the tip of the current branch\&. Prepare the tree object you would want to replace the latest commit as usual (this includes the usual \-i/\-o and explicit paths), and the commit log editor is seeded with the commit message from the tip of the current branch\&. The commit you create replaces the current tip -- if it was a merge, it will have the parents of the current tip as parents -- so the current top commit is discarded\&.
+
+It is a rough equivalent for:
+
+
+.nf
+        $ git reset \-\-soft HEAD^
+        $ \&.\&.\&. do something else to come up with the right tree \&.\&.\&.
+        $ git commit \-c ORIG_HEAD
+.fi
+but can be used to amend a merge commit\&.
+
 .TP
 \-i|\-\-include
 Instead of committing only the files specified on the command line, update them in the index file and then commit the whole index\&. This is the traditional behaviour\&.

diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1
index 5bc398a0d5a6b1303cc776f6841455b51aee7732..dd1676b49cb3756f1a9b3213da44110a1b756e21 100755 (executable)
--- a/man1/git-diff-files.1
+++ b/man1/git-diff-files.1
@@ -92,6 +92,10 @@ Look for differences that contain the change in <string>\&.
 \-\-pickaxe\-all
 When \-S finds a change, show all the changes in that changeset, not just the files that contain the change in <string>\&.
 
+.TP
+\-\-pickaxe\-regex
+Make the <string> not a plain string but an extended POSIX regex to match\&.
+
 .TP
 \-O<orderfile>
 Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line\&.
@@ -144,13 +148,15 @@ compares the index and the files on the filesystem\&.
 
 An output line is formatted this way:
 
-.IP
+.nf
 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
+.fi
+
 
 That is, from the left to the right:
 
@@ -207,8 +213,10 @@ an LF or a NUL when \fI\-z\fR option is used, to terminate the record\&.
 
 Example:
 
-.IP
+.nf
 :100644 100644 5be4a4\&.\&.\&.\&.\&.\&. 000000\&.\&.\&.\&.\&.\&. M file\&.c
+.fi
+
 
 When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
 
@@ -308,7 +316,7 @@ TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and
 
 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:
 
-.IP
+.nf
 diff \-\-combined describe\&.c
 @@@ +98,7 @@@
    return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
@@ -320,6 +328,8 @@ diff \-\-combined describe\&.c
   {
  +     unsigned char sha1[20];
  +     struct commit *cmit;
+.fi
+
 
 Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or (space -- 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\&.
 

diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1
index 1551b13af0db05e747275585bb83eb88de6f187a..5f6b504d1773f6c097d4e384db285f49dde5d255 100755 (executable)
--- a/man1/git-diff-index.1
+++ b/man1/git-diff-index.1
@@ -92,6 +92,10 @@ Look for differences that contain the change in <string>\&.
 \-\-pickaxe\-all
 When \-S finds a change, show all the changes in that changeset, not just the files that contain the change in <string>\&.
 
+.TP
+\-\-pickaxe\-regex
+Make the <string> not a plain string but an extended POSIX regex to match\&.
+
 .TP
 \-O<orderfile>
 Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line\&.
@@ -142,13 +146,15 @@ compares the index and the files on the filesystem\&.
 
 An output line is formatted this way:
 
-.IP
+.nf
 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
+.fi
+
 
 That is, from the left to the right:
 
@@ -205,8 +211,10 @@ an LF or a NUL when \fI\-z\fR option is used, to terminate the record\&.
 
 Example:
 
-.IP
+.nf
 :100644 100644 5be4a4\&.\&.\&.\&.\&.\&. 000000\&.\&.\&.\&.\&.\&. M file\&.c
+.fi
+
 
 When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
 
@@ -306,7 +314,7 @@ TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and
 
 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:
 
-.IP
+.nf
 diff \-\-combined describe\&.c
 @@@ +98,7 @@@
    return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
@@ -318,6 +326,8 @@ diff \-\-combined describe\&.c
   {
  +     unsigned char sha1[20];
  +     struct commit *cmit;
+.fi
+
 
 Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or (space -- 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\&.
 

diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1
index 059fc0f5cecb59b1b3ca22213700d68b466180e1..9532e37fe949b8b19fdaea32a23e0c0a46d395af 100755 (executable)
--- a/man1/git-diff-stages.1
+++ b/man1/git-diff-stages.1
@@ -92,6 +92,10 @@ Look for differences that contain the change in <string>\&.
 \-\-pickaxe\-all
 When \-S finds a change, show all the changes in that changeset, not just the files that contain the change in <string>\&.
 
+.TP
+\-\-pickaxe\-regex
+Make the <string> not a plain string but an extended POSIX regex to match\&.
+
 .TP
 \-O<orderfile>
 Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line\&.

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index b93a0599d90ddabab9aa3fb9a86d8137b9872691..3704ed0c3a36d4c75de550378972e53d505e26aa 100755 (executable)
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -101,6 +101,10 @@ Look for differences that contain the change in <string>\&.
 \-\-pickaxe\-all
 When \-S finds a change, show all the changes in that changeset, not just the files that contain the change in <string>\&.
 
+.TP
+\-\-pickaxe\-regex
+Make the <string> not a plain string but an extended POSIX regex to match\&.
+
 .TP
 \-O<orderfile>
 Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line\&.
@@ -202,7 +206,7 @@ torvalds@ppc970:~/git> git\-diff\-tree 5319e4\&.\&.\&.\&.\&.\&.
 
 which tells you that the last commit changed just one file (it's from this one:
 
-.IP
+.nf
 commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
 tree 5319e4d609cdd282069cc4dce33c1db559539b03
 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
@@ -213,6 +217,8 @@ Make "git\-fsck\-objects" print out all the root commits it finds\&.
 
 Once I do the reference tracking, I'll also make it print out all the
 HEAD commits it finds, which is even more interesting\&.
+.fi
+
 
 in case you care)\&.
 
@@ -243,13 +249,15 @@ compares the index and the files on the filesystem\&.
 
 An output line is formatted this way:
 
-.IP
+.nf
 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
+.fi
+
 
 That is, from the left to the right:
 
@@ -306,8 +314,10 @@ an LF or a NUL when \fI\-z\fR option is used, to terminate the record\&.
 
 Example:
 
-.IP
+.nf
 :100644 100644 5be4a4\&.\&.\&.\&.\&.\&. 000000\&.\&.\&.\&.\&.\&. M file\&.c
+.fi
+
 
 When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
 
@@ -407,7 +417,7 @@ TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and
 
 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:
 
-.IP
+.nf
 diff \-\-combined describe\&.c
 @@@ +98,7 @@@
    return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
@@ -419,6 +429,8 @@ diff \-\-combined describe\&.c
   {
  +     unsigned char sha1[20];
  +     struct commit *cmit;
+.fi
+
 
 Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or (space -- 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\&.