From: Junio C Hamano Date: Fri, 6 Apr 2007 00:51:43 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.1-53-g77e6f X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5678d690dfb3a08e15be4d4b7545053724543047;p=git.git Autogenerated HTML docs for v1.5.1-53-g77e6f --- diff --git a/git-fsck.html b/git-fsck.html index 684d0546f..0b549c21e 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -273,7 +273,7 @@ git-fsck(1) Manual Page

SYNOPSIS

-
git-fsck [--tags] [--root] [--unreachable] [--cache] +
git-fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs] [--full] [--strict] [<object>*]

DESCRIPTION

@@ -328,6 +328,17 @@ index file and all SHA1 references in .git/refs/* as heads.

+--no-reflogs +
+
+

+ Do not consider commits that are referenced only by an + entry in a reflog to be reachable. This option is meant + only to search for commits that used to be in a ref, but + now aren't, but are still in that corresponding reflog. +

+
+
--full
@@ -491,7 +502,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
diff --git a/git-fsck.txt b/git-fsck.txt index 058009d2f..8c68cf037 100644 --- a/git-fsck.txt +++ b/git-fsck.txt @@ -9,7 +9,7 @@ git-fsck - Verifies the connectivity and validity of the objects in the database SYNOPSIS -------- [verse] -'git-fsck' [--tags] [--root] [--unreachable] [--cache] +'git-fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs] [--full] [--strict] [*] DESCRIPTION @@ -38,6 +38,12 @@ index file and all SHA1 references in .git/refs/* as heads. Consider any object recorded in the index also as a head node for an unreachability trace. +--no-reflogs:: + Do not consider commits that are referenced only by an + entry in a reflog to be reachable. This option is meant + only to search for commits that used to be in a ref, but + now aren't, but are still in that corresponding reflog. + --full:: Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate diff --git a/git-rev-list.html b/git-rev-list.html index a234345d9..653d8bc52 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -285,6 +285,7 @@ git-rev-list(1) Manual Page [ --stdin ] [ --topo-order ] [ --parents ] + [ --left-right ] [ --encoding[=<encoding>] ] [ --(author|committer|grep)=<pattern> ] [ [--objects | --objects-edge] [ --unpacked ] ] @@ -654,6 +655,38 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff Print the parents of the commit.

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

+

For example, if you have this topology:

+
+
+
             y---b---b  branch B
+            / \ /
+           /   .
+          /   / \
+         o---x---a---a  branch A
+
+

you would get an output line this:

+
+
+
        $ git rev-list --left-right --boundary --pretty=oneline A...B
+
+        >bbbbbbb... 3rd on b
+        >bbbbbbb... 2nd on b
+        <aaaaaaa... 3rd on a
+        <aaaaaaa... 2nd on a
+        -yyyyyyy... 1st on b
+        -xxxxxxx... 1st on a
+
+
@@ -979,7 +1012,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 3fa45b81c..12b71ed0b 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -21,6 +21,7 @@ SYNOPSIS [ \--stdin ] [ \--topo-order ] [ \--parents ] + [ \--left-right ] [ \--encoding[=] ] [ \--(author|committer|grep)= ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] @@ -101,6 +102,36 @@ include::pretty-formats.txt[] Print the parents of the commit. +--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 `-`. ++ +For example, if you have this topology: ++ +----------------------------------------------------------------------- + y---b---b branch B + / \ / + / . + / / \ + o---x---a---a branch A +----------------------------------------------------------------------- ++ +you would get an output line this: ++ +----------------------------------------------------------------------- + $ git rev-list --left-right --boundary --pretty=oneline A...B + + >bbbbbbb... 3rd on b + >bbbbbbb... 2nd on b +