From ee695f22c4399a2593020bdf65682a21edbd0526 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 21 Jun 2007 00:35:36 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2.2-249-g45fd --- git-diff-tree.html | 15 ++++++++++++++- git-log.html | 29 +++++++++++++++++++++++++++-- git-log.txt | 9 ++++++++- git-read-tree.html | 15 +++++++++++++-- git-read-tree.txt | 8 +++++++- git-reflog.html | 19 ++++++++++++++++++- git-reflog.txt | 13 +++++++++++++ git-rev-list.html | 37 ++++++++++++++++++++++++++++++++++++- git-rev-list.txt | 13 +++++++++++++ git-rev-parse.html | 11 ++++++++++- git-rev-parse.txt | 4 ++++ git-show.html | 15 ++++++++++++++- pretty-options.txt | 9 +++++++++ 13 files changed, 186 insertions(+), 11 deletions(-) diff --git a/git-diff-tree.html b/git-diff-tree.html index daf06da1c..5de4a7d12 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -764,6 +764,19 @@ separated with a single space are given.

+--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.

+
+
--encoding[=<encoding>]
@@ -1517,7 +1530,7 @@ two unresolved merge parents with the working tree file diff --git a/git-log.html b/git-log.html index db601f0f5..63b22ef92 100644 --- a/git-log.html +++ b/git-log.html @@ -298,6 +298,19 @@ each commit introduces are shown.

+--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.

+
+
--encoding[=<encoding>]
@@ -363,7 +376,19 @@ each commit introduces are shown.

- Print out the ref names of any commits that are shown. + Print out the ref names of any commits that are shown. +

+
+
+--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.

@@ -787,7 +812,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 6157edb40..7adcdefac 100644 --- a/git-log.txt +++ b/git-log.txt @@ -52,7 +52,14 @@ include::pretty-options.txt[] See also gitlink:git-reflog[1]. --decorate:: - Print out the ref names of any commits that are shown. + Print out the ref names of any commits that are shown. + +--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. ...:: Show only commits that affect the specified paths. diff --git a/git-read-tree.html b/git-read-tree.html index d1d94ba6c..ec7470ca1 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -272,7 +272,7 @@ git-read-tree(1) Manual Page

SYNOPSIS

-

git-read-tree (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])

+

git-read-tree (<tree-ish> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]])

DESCRIPTION

@@ -333,6 +333,17 @@ will be in unmerged state when git-read-tree returns.

+--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. +

+
+
--aggressive
@@ -700,7 +711,7 @@ have finished your work-in-progress), attempt the merge again.

diff --git a/git-read-tree.txt b/git-read-tree.txt index 84184d629..74c5478ba 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index SYNOPSIS -------- -'git-read-tree' ( | [[-m [--aggressive] | --reset | --prefix=] [-u | -i]] [--exclude-per-directory=] [--index-output=] [ []]) +'git-read-tree' ( | [[-m [--trivial] [--aggressive] | --reset | --prefix=] [-u | -i]] [--exclude-per-directory=] [--index-output=] [ []]) DESCRIPTION @@ -50,6 +50,12 @@ OPTIONS trees that are not directly related to the current working tree status into a temporary index file. +--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. + --aggressive:: Usually a three-way merge by `git-read-tree` resolves the merge for really trivial cases and leaves other diff --git a/git-reflog.html b/git-reflog.html index 8a0f25ce5..1fe9a32d9 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -298,6 +298,23 @@ the current branch. It is basically an alias for git log -g --abbrev-commit
+--stale-fix +
+
+

+ This revamps the logic — 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 git prune. 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.

+
+
--expire=<time>
@@ -343,7 +360,7 @@ the current branch. It is basically an alias for git log -g --abbrev-commit
diff --git a/git-reflog.txt b/git-reflog.txt index f717e1e30..89bc9c51e 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -39,6 +39,19 @@ the current branch. It is basically an alias for 'git log -g --abbrev-commit OPTIONS ------- +--stale-fix:: + This revamps the logic -- 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 'git prune'. 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. + --expire=
+--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.

+
+
--encoding[=<encoding>]
@@ -406,6 +421,14 @@ e.g. "2 hours ago".

+--timestamp +
+
+

+ Print the raw commit timestamp. +

+
+
--left-right
@@ -572,6 +595,18 @@ limiting may be applied.

+--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. +

+
+
--no-merges
@@ -1074,7 +1109,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 0dba73f27..32cb13fae 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -16,11 +16,13 @@ SYNOPSIS [ \--sparse ] [ \--no-merges ] [ \--remove-empty ] + [ \--full-history ] [ \--not ] [ \--all ] [ \--stdin ] [ \--topo-order ] [ \--parents ] + [ \--timestamp ] [ \--left-right ] [ \--cherry-pick ] [ \--encoding[=] ] @@ -116,6 +118,9 @@ e.g. "2 hours ago". Print the parents of the commit. +--timestamp:: + Print the raw commit timestamp. + --left-right:: Mark which side of a symmetric diff a commit is reachable from. @@ -228,6 +233,14 @@ limiting may be applied. Stop when a given path disappears from the tree. +--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. + --no-merges:: Do not print commits with more than one parent. diff --git a/git-rev-parse.html b/git-rev-parse.html index 0ebcd0997..d99dd799a 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -432,6 +432,15 @@ distinguish between them.

+--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. +

+
+
--short, --short=number
@@ -709,7 +718,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index e1cb4ef85..87771b832 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -89,6 +89,10 @@ OPTIONS --git-dir:: Show `$GIT_DIR` if defined else show the path to the .git directory. +--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. + --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 diff --git a/git-show.html b/git-show.html index 97a1de651..4faf1b497 100644 --- a/git-show.html +++ b/git-show.html @@ -313,6 +313,19 @@ control how the changes the commit introduces are shown.

+--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.

+
+
--encoding[=<encoding>]
@@ -739,7 +752,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

diff --git a/pretty-options.txt b/pretty-options.txt index 6338def5a..746bc5b7f 100644 --- a/pretty-options.txt +++ b/pretty-options.txt @@ -5,6 +5,15 @@ 'full', 'fuller', 'email', 'raw' and 'format:'. When left out the format default to 'medium'. +--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. + --encoding[=]:: The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the -- 2.26.2