Autogenerated man pages for v1.5.0-rc3-80-g35ce

diff --git a/man1/git-blame.1 b/man1/git-blame.1
index 9a2b6ba02b1ff77aa188f02deb67271f24328df6..76e3dfca3a059dae8cf9cb1daeefb81c2c191c5a 100644 (file)
--- 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" "01/28/2007" "" ""
+.TH "GIT\-BLAME" "1" "02/06/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -13,7 +13,7 @@ git\-blame \- Show what revision and author last modified each line of a file
 .sp
 .nf
 \fIgit\-blame\fR [\-c] [\-l] [\-t] [\-f] [\-n] [\-p] [\-\-incremental] [\-L n,m] [\-S <revs\-file>]
-            [\-M] [\-C] [\-C] [\-\-since=<date>] [<rev>] [\-\-] <file>
+            [\-M] [\-C] [\-C] [\-\-since=<date>] [<rev> | \-\-contents <file>] [\-\-] <file>
 .fi
 .SH "DESCRIPTION"
 Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision.
@@ -58,6 +58,9 @@ Show in a format designed for machine consumption.
 \-\-incremental
 Show the result incrementally in a format designed for machine consumption.
 .TP
+\-\-contents <file>
+When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of he named file (specify \- to make the command read from the standard input).
+.TP
 \-M
 Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file has A and then B, and the commit changes it to B and then A), traditional \fIblame\fR algorithm typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent.
 .TP

diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1
index ae9485a158109ee30506f1c03584833f81b11920..65d0dfe78af195f5639fa378f3bc0a15737d1eed 100644 (file)
--- a/man1/git-cvsexportcommit.1
+++ b/man1/git-cvsexportcommit.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\-CVSEXPORTCOMMIT" "1" "01/19/2007" "" ""
+.TH "GIT\-CVSEXPORTCOMMIT" "1" "02/06/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -10,7 +10,7 @@
 .SH "NAME"
 git\-cvsexportcommit \- Export a single commit to a CVS checkout
 .SH "SYNOPSIS"
-\fIgit\-cvsexportcommit\fR [\-h] [\-v] [\-c] [\-p] [\-a] [\-f] [\-m msgprefix] [PARENTCOMMIT] COMMITID
+\fIgit\-cvsexportcommit\fR [\-h] [\-v] [\-c] [\-P] [\-p] [\-a] [\-f] [\-m msgprefix] [PARENTCOMMIT] COMMITID
 .SH "DESCRIPTION"
 Exports a commit from GIT to a CVS checkout, making it easier to merge patches from a git repository into a CVS repository.
 
@@ -35,6 +35,9 @@ Add authorship information. Adds Author line, and Committer (if different from A
 \-f
 Force the merge even if the files are not up to date.
 .TP
+\-P
+Force the parent commit, even if it is not a direct parent.
+.TP
 \-m
 Prepend the commit message with the provided prefix. Useful for patch series and the like.
 .TP

diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1
index 839c7ad5dda5006e0345a5a92be41065f05e5f08..a3fd85605cd68d795dced8b8a1280a943805835e 100644 (file)
--- a/man1/git-for-each-ref.1
+++ b/man1/git-for-each-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\-FOR\-EACH\-REF" "1" "01/29/2007" "" ""
+.TH "GIT\-FOR\-EACH\-REF" "1" "02/06/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -35,7 +35,7 @@ Various values from structured fields in referenced objects can be used to inter
 For all objects, the following names can be used:
 .TP
 refname
-The name of the ref (the part after $GIT_DIR/refs/).
+The name of the ref (the part after $GIT_DIR/).
 .TP
 objecttype
 The type of the object (blob, tree, commit, tag).

diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index 20b15e42d55b576ec958a471a7988bf0ce37885c..cc9361efc2a55655e1cdb61d6c6595b2796a8a93 100644 (file)
--- a/man1/git-rebase.1
+++ b/man1/git-rebase.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\-REBASE" "1" "01/19/2007" "" ""
+.TH "GIT\-REBASE" "1" "02/06/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -92,6 +92,23 @@ would result in:
 .fi
 This is useful when topicB does not depend on topicA.
 
+A range of commits could also be removed with rebase. If we have the following situation:
+.sp
+.nf
+    E\-\-\-F\-\-\-G\-\-\-H\-\-\-I\-\-\-J  topicA
+.fi
+then the command
+.sp
+.nf
+git\-rebase \-\-onto topicA~5 topicA~2 topicA
+.fi
+would result in the removal of commits F and G:
+.sp
+.nf
+    E\-\-\-H'\-\-\-I'\-\-\-J'  topicA
+.fi
+This is useful if F and G were flawed in some way, or should not be part of topicA. Note that the argument to \-\-onto and the <upstream> parameter can be any valid commit\-ish.
+
 In case of conflict, git\-rebase will stop at the first problematic commit and leave conflict markers in the tree. You can use git diff to locate the markers (<<<<<<) and make edits to resolve the conflict. For each file you edit, you need to tell git that the conflict has been resolved, typically this would be done with
 .sp
 .nf
@@ -110,10 +127,10 @@ git rebase \-\-abort
 .SH "OPTIONS"
 .TP
 <newbase>
-Starting point at which to create the new commits. If the \-\-onto option is not specified, the starting point is <upstream>.
+Starting point at which to create the new commits. If the \-\-onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name.
 .TP
 <upstream>
-Upstream branch to compare against.
+Upstream branch to compare against. May be any valid commit, not just an existing branch name.
 .TP
 <branch>
 Working branch; defaults to HEAD.

diff --git a/man7/git.7 b/man7/git.7
index 9bf3f802c26ac8f36f0b6b66236a399163f4a946..b76c459cf5c3918f4233e06b13ea2868e19aa22d 100644 (file)
--- 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/05/2007" "" ""
+.TH "GIT" "7" "02/06/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)