Autogenerated man pages for v1.3.3-g63df

diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1
index c7784aa114b32d4a3f44a7d261d6cadd9660a789..3b8b20a55950307e4bf67b9a94a2f8fb327c2019 100755 (executable)
--- a/man1/git-diff-files.1
+++ b/man1/git-diff-files.1
@@ -48,6 +48,10 @@ Generate patch but keep also the default raw diff output\&.
 \-\-stat
 Generate a diffstat instead of a patch\&.
 
+.TP
+\-\-summary
+Output a condensed summary of extended header information such as creations, renames and mode changes\&.
+
 .TP
 \-\-patch\-with\-stat
 Generate patch and prepend its diffstat\&.

diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1
index 1c192b84349a293c032654cf43cd8b5cb2c12224..786b5c627a03ae10080586379ebdba0e02ccfe1d 100755 (executable)
--- a/man1/git-diff-index.1
+++ b/man1/git-diff-index.1
@@ -48,6 +48,10 @@ Generate patch but keep also the default raw diff output\&.
 \-\-stat
 Generate a diffstat instead of a patch\&.
 
+.TP
+\-\-summary
+Output a condensed summary of extended header information such as creations, renames and mode changes\&.
+
 .TP
 \-\-patch\-with\-stat
 Generate patch and prepend its diffstat\&.

diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1
index 96682dfaefe8f4e7fe509ce2ccb2c1139da95101..2b7706ac03f62b7fa61f24f5cbf80adf3a515efa 100755 (executable)
--- a/man1/git-diff-stages.1
+++ b/man1/git-diff-stages.1
@@ -48,6 +48,10 @@ Generate patch but keep also the default raw diff output\&.
 \-\-stat
 Generate a diffstat instead of a patch\&.
 
+.TP
+\-\-summary
+Output a condensed summary of extended header information such as creations, renames and mode changes\&.
+
 .TP
 \-\-patch\-with\-stat
 Generate patch and prepend its diffstat\&.

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 5b25d98c14cb090bbddb38ea1e5e15aace04544f..6357b8e996961d94a234b26f720458400dd21957 100755 (executable)
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -57,6 +57,10 @@ Generate patch but keep also the default raw diff output\&.
 \-\-stat
 Generate a diffstat instead of a patch\&.
 
+.TP
+\-\-summary
+Output a condensed summary of extended header information such as creations, renames and mode changes\&.
+
 .TP
 \-\-patch\-with\-stat
 Generate patch and prepend its diffstat\&.

diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1
index 6d466c591e4067b79f6b586f27ab10ff9516059c..e7a6a65416db4835cf060fba8ab3357881cd8417 100755 (executable)
--- a/man1/git-merge-base.1
+++ b/man1/git-merge-base.1
@@ -23,16 +23,25 @@ git-merge-base \- Finds as good a common ancestor as possible for a merge
 .SH "SYNOPSIS"
 
 
-git\-merge\-base <commit> <commit>
+\fIgit\-merge\-base\fR [\-\-all] <commit> <commit>
 
 .SH "DESCRIPTION"
 
 
-"git\-merge\-base" finds as good a common ancestor as possible\&. Given a selection of equally good common ancestors it should not be relied on to decide in any particular way\&.
+"git\-merge\-base" finds as good a common ancestor as possible between the two commits\&. That is, given two commits A and B \fIgit\-merge\-base A B\fR will output a commit which is reachable from both A and B through the parent relationship\&.
+
+
+Given a selection of equally good common ancestors it should not be relied on to decide in any particular way\&.
 
 
 The "git\-merge\-base" algorithm is still in flux \- use the source...
 
+.SH "OPTIONS"
+
+.TP
+\-\-all
+Output all common ancestors for the two commits instead of just one\&.
+
 .SH "AUTHOR"
 
 

diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index dca31e15c099b017598e4ef1d5919f298b211634..56792f29e1e14d7b5845e4a4b7841fa68a63b8af 100755 (executable)
--- a/man1/git-rebase.1
+++ b/man1/git-rebase.1
@@ -26,10 +26,7 @@ git-rebase \- Rebase local commits to a new head
 \fIgit\-rebase\fR [\-\-onto <newbase>] <upstream> [<branch>]
 
 
-\fIgit\-rebase\fR \-\-continue
-
-
-\fIgit\-rebase\fR \-\-abort
+\fIgit\-rebase\fR \-\-continue | \-\-skip | \-\-abort
 
 .SH "DESCRIPTION"
 
@@ -37,7 +34,7 @@ git-rebase \- Rebase local commits to a new head
 git\-rebase replaces <branch> with a new branch of the same name\&. When the \-\-onto option is provided the new branch starts out with a HEAD equal to <newbase>, otherwise it is equal to <upstream>\&. It then attempts to create a new commit for each commit from the original <branch> that does not exist in the <upstream> branch\&.
 
 
-It is possible that a merge failure will prevent this process from being completely automatic\&. You will have to resolve any such merge failure and run git rebase \-\-continue\&. If you can not resolve the merge failure, running git rebase \-\-abort will restore the original <branch> and remove the working files found in the \&.dotest directory\&.
+It is possible that a merge failure will prevent this process from being completely automatic\&. You will have to resolve any such merge failure and run git rebase \-\-continue\&. Another option is to bypass the commit that caused the merge failure with git rebase \-\-skip\&. To restore the original <branch> and remove the \&.dotest working files, use the command git rebase \-\-abort instead\&.
 
 
 Note that if <branch> is not specified on the command line, the currently checked out branch is used\&.

diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1
index a0d68969dee0d2bf2a2926dcab91c4b7ded3a99e..cd19ed8d6ee845c007e5c14ee341f71eb319045c 100755 (executable)
--- a/man1/git-rev-parse.1
+++ b/man1/git-rev-parse.1
@@ -72,6 +72,18 @@ Usually the object names are output in SHA1 form (with possible \fI^\fR prefix);
 \-\-all
 Show all refs found in $GIT_DIR/refs\&.
 
+.TP
+\-\-branches
+Show branch refs found in $GIT_DIR/refs/heads\&.
+
+.TP
+\-\-tags
+Show tag refs found in $GIT_DIR/refs/tags\&.
+
+.TP
+\-\-remotes
+Show tag refs found in $GIT_DIR/refs/remotes\&.
+
 .TP
 \-\-show\-prefix
 When the command is invoked from a subdirectory, show the path of the current directory relative to the top\-level directory\&.