From: Junio C Hamano Date: Thu, 21 Jun 2007 00:35:41 +0000 (+0000) Subject: Autogenerated manpages for v1.5.2.2-249-g45fd X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d93a74527cb1cf68ee31b3f17207359335162d5;p=git.git Autogenerated manpages for v1.5.2.2-249-g45fd --- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 57a46de71..fca6286a7 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" "06/16/2007" "Git 1.5.2.1.255.gca6c0" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "06/21/2007" "Git 1.5.2.2.249.g45fd" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -178,6 +178,11 @@ This flag causes "git\-diff\-tree \-\-stdin" to also show the commit message bef \-\-pretty[=\fI\fR] Pretty print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When left out the format default to \fImedium\fR. .TP +\-\-abbrev\-commit +Instead of showing the full 40\-byte hexadecimal commit object name, show only handful hexdigits prefix. Non default number of digits can be specified with "\-\-abbrev=" (which also modifies diff output, if it is displayed). + +This should make "\-\-pretty=oneline" a whole lot more readable for people using 80\-column terminals. +.TP \-\-encoding[=] The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re\-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF\-8. .TP diff --git a/man1/git-log.1 b/man1/git-log.1 index 1ebf279e3..a2a30e053 100644 --- a/man1/git-log.1 +++ b/man1/git-log.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\-LOG" "1" "06/16/2007" "Git 1.5.2.1.144.gabc40" "Git Manual" +.TH "GIT\-LOG" "1" "06/21/2007" "Git 1.5.2.2.249.g45fd" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -22,6 +22,11 @@ This manual page describes only the most frequently used options. \-\-pretty[=\fI\fR] Pretty print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When left out the format default to \fImedium\fR. .TP +\-\-abbrev\-commit +Instead of showing the full 40\-byte hexadecimal commit object name, show only handful hexdigits prefix. Non default number of digits can be specified with "\-\-abbrev=" (which also modifies diff output, if it is displayed). + +This should make "\-\-pretty=oneline" a whole lot more readable for people using 80\-column terminals. +.TP \-\-encoding[=] The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re\-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF\-8. .TP @@ -43,6 +48,9 @@ Show commits as they were recorded in the reflog. The log contains a record abou \-\-decorate Print out the ref names of any commits that are shown. .TP +\-\-full\-diff +Without this flag, "git log \-p \&..." shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that "\&..." limits only commits, and doesn't limit diff for those commits. +.TP \&... Show only commits that affect the specified paths. .SH "PRETTY FORMATS" diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index fc501f102..9627420e2 100644 --- a/man1/git-read-tree.1 +++ b/man1/git-read-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\-READ\-TREE" "1" "06/16/2007" "Git 1.5.2.2.236.g952c8" "Git Manual" +.TH "GIT\-READ\-TREE" "1" "06/21/2007" "Git 1.5.2.2.249.g45fd" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-read\-tree \- Reads tree information into the index .SH "SYNOPSIS" -\fIgit\-read\-tree\fR ( | [[\-m [\-\-aggressive] | \-\-reset | \-\-prefix=] [\-u | \-i]] [\-\-exclude\-per\-directory=] [\-\-index\-output=] [ []]) +\fIgit\-read\-tree\fR ( | [[\-m [\-\-trivial] [\-\-aggressive] | \-\-reset | \-\-prefix=] [\-u | \-i]] [\-\-exclude\-per\-directory=] [\-\-index\-output=] [ []]) .SH "DESCRIPTION" Reads the tree information given by into the index, but does not actually \fBupdate\fR any of the files it "caches". (see: \fBgit\-checkout\-index\fR(1)) @@ -31,6 +31,9 @@ After a successful merge, update the files in the work tree with the result of t \-i Usually a merge requires the index file as well as the files in the working tree are up to date with the current head commit, in order not to lose local changes. This flag disables the check with the working tree and is meant to be used when creating a merge of trees that are not directly related to the current working tree status into a temporary index file. .TP +\-\-trivial +Restrict three\-way merge by git\-read\-tree to happen only if there is no file\-level merging required, instead of resolving merge for trivial cases and leaving conflicting files unresolved in the index. +.TP \-\-aggressive Usually a three\-way merge by git\-read\-tree resolves the merge for really trivial cases and leaves other cases unresolved in the index, so that Porcelains can implement different merge policies. This flag makes the command to resolve a few more cases internally: .RS diff --git a/man1/git-reflog.1 b/man1/git-reflog.1 index 8147791bc..4dfb0b1ad 100644 --- a/man1/git-reflog.1 +++ b/man1/git-reflog.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\-REFLOG" "1" "06/16/2007" "Git 1.5.2.2.236.g952c8" "Git Manual" +.TH "GIT\-REFLOG" "1" "06/21/2007" "Git 1.5.2.2.249.g45fd" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -27,6 +27,11 @@ The subcommand "expire" is used to prune older reflog entries. Entries older tha The subcommand "show" (which is also the default, in the absense of any subcommands) will take all the normal log options, and show the log of the current branch. It is basically an alias for \fIgit log \-g \-\-abbrev\-commit \-\-pretty=oneline\fR, see \fBgit\-log\fR(1). .SH "OPTIONS" .TP +\-\-stale\-fix +This revamps the logic \(em the definition of "broken commit" becomes: a commit that is not reachable from any of the refs and there is a missing object among the commit, tree, or blob objects reachable from it that is not reachable from any of the refs. + +This computation involves traversing all the reachable objects, i.e. it has the same cost as \fIgit prune\fR. Fortunately, once this is run, we should not have to ever worry about missing objects, because the current prune and pack\-objects know about reflogs and protect objects referred by them. +.TP \-\-expire=