Autogenerated manpages for v1.5.2.2-249-g45fd

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 57a46de71b409fe729a80af3cc726fcd0dd9a790..fca6286a71afc52fb33314c08bd37b6325ac93ca 100644 (file)
--- 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<format>\fR]
 Pretty print the contents of the commit logs in a given format, where \fI<format>\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:<string>\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=<n>" (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[=<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 1ebf279e3f31f658c0d959dd0d2cd90726c96156..a2a30e053de2a3c0f2ad0f7b44bad5496ce88763 100644 (file)
--- 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<format>\fR]
 Pretty print the contents of the commit logs in a given format, where \fI<format>\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:<string>\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=<n>" (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[=<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 <paths>\&..." 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 "<paths>\&..." limits only commits, and doesn't limit diff for those commits.
+.TP
 <paths>\&...
 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 fc501f102753d63f127ad8807f42878e9f03bf35..9627420e2c3dc0ac0ecd28e3d62ca1f6fae4b3f4 100644 (file)
--- 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 (<tree\-ish> | [[\-m [\-\-aggressive] | \-\-reset | \-\-prefix=<prefix>] [\-u | \-i]] [\-\-exclude\-per\-directory=<gitignore>] [\-\-index\-output=<file>] <tree\-ish1> [<tree\-ish2> [<tree\-ish3>]])
+\fIgit\-read\-tree\fR (<tree\-ish> | [[\-m [\-\-trivial] [\-\-aggressive] | \-\-reset | \-\-prefix=<prefix>] [\-u | \-i]] [\-\-exclude\-per\-directory=<gitignore>] [\-\-index\-output=<file>] <tree\-ish1> [<tree\-ish2> [<tree\-ish3>]])
 .SH "DESCRIPTION"
 Reads the tree information given by <tree\-ish> 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 8147791bc545e8d45228baba1d18c4c42072ab3e..4dfb0b1ad26e436d5aed7d5eb60b2620c27c1d40 100644 (file)
--- 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=<time>
 Entries older than this time are pruned. Without the option it is taken from configuration gc.reflogExpire, which in turn defaults to 90 days.
 .TP

diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1
index ab43ecddb233361b302601434e3b99c7fb9c15ba..22f8f85be5841843f1a8e7e5519459a4da69b739 100644 (file)
--- a/man1/git-rev-list.1
+++ b/man1/git-rev-list.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\-REV\-LIST" "1" "06/16/2007" "Git 1.5.2.1.144.gabc40" "Git Manual"
+.TH "GIT\-REV\-LIST" "1" "06/21/2007" "Git 1.5.2.2.249.g45fd" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -19,11 +19,13 @@ git\-rev\-list \- Lists commit objects in reverse chronological order
              [ \-\-sparse ]
              [ \-\-no\-merges ]
              [ \-\-remove\-empty ]
+             [ \-\-full\-history ]
              [ \-\-not ]
              [ \-\-all ]
              [ \-\-stdin ]
              [ \-\-topo\-order ]
              [ \-\-parents ]
+             [ \-\-timestamp ]
              [ \-\-left\-right ]
              [ \-\-cherry\-pick ]
              [ \-\-encoding[=<encoding>] ]
@@ -69,6 +71,11 @@ Using these options, \fBgit\-rev\-list\fR(1) will act similar to the more specia
 \-\-pretty[=\fI<format>\fR]
 Pretty print the contents of the commit logs in a given format, where \fI<format>\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:<string>\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=<n>" (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[=<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
@@ -90,6 +97,9 @@ Print the contents of the commit in raw\-format; each record is separated with a
 \-\-parents
 Print the parents of the commit.
 .TP
+\-\-timestamp
+Print the raw commit timestamp.
+.TP
 \-\-left\-right
 Mark which side of a symmetric diff a commit is reachable from. Commits from the left side are prefixed with < and those from the right with >. If combined with \-\-boundary, those commits are prefixed with \-.
 
@@ -161,6 +171,9 @@ Consider the limiting patterns to be extended regular expressions instead of the
 \-\-remove\-empty
 Stop when a given path disappears from the tree.
 .TP
+\-\-full\-history
+Show also parts of history irrelevant to current state of a given path. This turns off history simplification, which removed merges which didn't change anything at all at some child. It will still actually simplify away merges that didn't change anything at all into either child.
+.TP
 \-\-no\-merges
 Do not print commits with more than one parent.
 .TP

diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1
index e27299a6b440580d146f5f81092a705169ff138c..7326f178325977f08da42771ae1e037cbe52542c 100644 (file)
--- a/man1/git-rev-parse.1
+++ b/man1/git-rev-parse.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\-REV\-PARSE" "1" "06/16/2007" "Git 1.5.2.2.236.g952c8" "Git Manual"
+.TH "GIT\-REV\-PARSE" "1" "06/21/2007" "Git 1.5.2.2.249.g45fd" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -63,6 +63,9 @@ When the command is invoked from a subdirectory, show the path of the top\-level
 \-\-git\-dir
 Show $GIT_DIR if defined else show the path to the .git directory.
 .TP
+\-\-is\-inside\-git\-dir
+Return "true" if we are in the git directory, otherwise "false". Some commands require to be run in a working directory.
+.TP
 \-\-short, \-\-short=number
 Instead of outputting the full SHA1 values of object names try to abbreviate them to a shorter unique name. When no length is specified 7 is used. The minimum length is 4.
 .TP

diff --git a/man1/git-show.1 b/man1/git-show.1
index 342c05429880dd2a94eaa50b0c18e945f615baae..8fb8b508befde52cd3a41d656a2b22339ed811f9 100644 (file)
--- a/man1/git-show.1
+++ b/man1/git-show.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\-SHOW" "1" "06/16/2007" "Git 1.5.2.1.144.gabc40" "Git Manual"
+.TH "GIT\-SHOW" "1" "06/21/2007" "Git 1.5.2.2.249.g45fd" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -33,6 +33,11 @@ The name of the object to show. For a more complete list of ways to spell object
 \-\-pretty[=\fI<format>\fR]
 Pretty print the contents of the commit logs in a given format, where \fI<format>\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:<string>\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=<n>" (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[=<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.
 .SH "PRETTY FORMATS"