From 46610160c6d9b28da4587f2910544d2e07405c85 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 May 2006 10:34:24 +0000 Subject: [PATCH] Autogenerated man pages for v1.3.3-g63df --- man1/git-diff-files.1 | 4 ++++ man1/git-diff-index.1 | 4 ++++ man1/git-diff-stages.1 | 4 ++++ man1/git-diff-tree.1 | 4 ++++ man1/git-merge-base.1 | 13 +++++++++++-- man1/git-rebase.1 | 7 ++----- man1/git-rev-parse.1 | 12 ++++++++++++ 7 files changed, 41 insertions(+), 7 deletions(-) diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index c7784aa11..3b8b20a55 100755 --- 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 1c192b843..786b5c627 100755 --- 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 96682dfae..2b7706ac0 100755 --- 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 5b25d98c1..6357b8e99 100755 --- 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 6d466c591..e7a6a6541 100755 --- 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 +\fIgit\-merge\-base\fR [\-\-all] .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 dca31e15c..56792f29e 100755 --- 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 ] [] -\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 with a new branch of the same name\&. When the \-\-onto option is provided the new branch starts out with a HEAD equal to , otherwise it is equal to \&. It then attempts to create a new commit for each commit from the original that does not exist in the 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 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 and remove the \&.dotest working files, use the command git rebase \-\-abort instead\&. Note that if 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 a0d68969d..cd19ed8d6 100755 --- 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\&. -- 2.26.2