From fbe0052a6097e716bc4ad9676c3c4d6f472a1d8d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 19 Oct 2006 05:58:48 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.3-g72bb --- diff-options.txt | 5 +++++ git-diff-files.html | 12 +++++++++++- git-diff-index.html | 12 +++++++++++- git-diff-stages.html | 12 +++++++++++- git-diff-tree.html | 12 +++++++++++- git-grep.html | 23 +++++++++++++++++++++-- git-grep.txt | 11 ++++++++++- git-rebase.html | 12 ++++++++++-- git-rebase.txt | 5 ++++- git-rev-parse.html | 27 +++++++++++++++++++++++++-- git-rev-parse.txt | 16 +++++++++++++++- 11 files changed, 134 insertions(+), 13 deletions(-) diff --git a/diff-options.txt b/diff-options.txt index 7b7b9e8ce..e112172ca 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -16,6 +16,11 @@ The width of the filename part can be controlled by giving another width to it separated by a comma. +--numstat:: + Similar to \--stat, but shows number of added and + deleted lines in decimal notation and pathname without + abbreviation, to make it more machine friendly. + --summary:: Output a condensed summary of extended header information such as creations, renames and mode changes. diff --git a/git-diff-files.html b/git-diff-files.html index 1edeb7ad0..67bf25186 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -328,6 +328,16 @@ same as "git-diff-index" and "git-diff-tree".

+--numstat +
+
+

+ Similar to --stat, but shows number of added and + deleted lines in decimal notation and pathname without + abbreviation, to make it more machine friendly. +

+
+
--summary
@@ -917,7 +927,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 386993878..4118f5cc5 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -329,6 +329,16 @@ entries in the index are compared.

+--numstat +
+
+

+ Similar to --stat, but shows number of added and + deleted lines in decimal notation and pathname without + abbreviation, to make it more machine friendly. +

+
+
--summary
@@ -1007,7 +1017,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 9030aabc0..0f2faa3e9 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -326,6 +326,16 @@ unmerged index file.

+--numstat +
+
+

+ Similar to --stat, but shows number of added and + deleted lines in decimal notation and pathname without + abbreviation, to make it more machine friendly. +

+
+
--summary
@@ -891,7 +901,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 6dc78cd06..e105e89ac 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -331,6 +331,16 @@ git-diff-tree(1) Manual Page

+--numstat +
+
+

+ Similar to --stat, but shows number of added and + deleted lines in decimal notation and pathname without + abbreviation, to make it more machine friendly. +

+
+
--summary
@@ -1079,7 +1089,7 @@ two unresolved merge parents with the working tree file diff --git a/git-grep.html b/git-grep.html index 7157465a1..1074a2f8b 100644 --- a/git-grep.html +++ b/git-grep.html @@ -278,7 +278,7 @@ git-grep(1) Manual Page [-v | --invert-match] [-h|-H] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] [-l | --files-with-matches] [-L | --files-without-match] - [-c | --count] + [-c | --count] [--all-match] [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>…] [<tree>…] @@ -436,6 +436,16 @@ registered in the index file, or given tree objects.

+--all-match +
+
+

+ When giving multiple pattern expressions combined with --or, + this flag is specified to limit the match to files that + have lines to match all of them. +

+
+
<tree>…
@@ -466,6 +476,15 @@ git grep -e '#define' --and \( -e MAX_PATH -e PATH_MAX \) PATH_MAX.

+
+git grep --all-match -e NODE -e Unexpected +
+
+

+ Looks for a line that has NODE or Unexpected in + files that have lines that match both. +

+

Author

@@ -483,7 +502,7 @@ revamped by Junio C Hamano.

diff --git a/git-grep.txt b/git-grep.txt index d8af4d961..bfbece986 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -14,7 +14,7 @@ SYNOPSIS [-v | --invert-match] [-h|-H] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings] [-n] [-l | --files-with-matches] [-L | --files-without-match] - [-c | --count] + [-c | --count] [--all-match] [-A ] [-B ] [-C ] [-f ] [-e] [--and|--or|--not|(|)|-e ...] [...] @@ -96,6 +96,11 @@ OPTIONS higher precedence than `--or`. `-e` has to be used for all patterns. +--all-match:: + When giving multiple pattern expressions combined with `--or`, + this flag is specified to limit the match to files that + have lines to match all of them. + `...`:: Search blobs in the trees for specified patterns. @@ -111,6 +116,10 @@ git grep -e \'#define\' --and \( -e MAX_PATH -e PATH_MAX \):: Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`. +git grep --all-match -e NODE -e Unexpected:: + Looks for a line that has `NODE` or `Unexpected` in + files that have lines that match both. + Author ------ Originally written by Linus Torvalds , later diff --git a/git-rebase.html b/git-rebase.html index 94d7caf9a..6403e43b2 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -272,7 +272,7 @@ git-rebase(1) Manual Page

SYNOPSIS

-

git-rebase [--merge] [--onto <newbase>] <upstream> [<branch>]

+

git-rebase [-v] [--merge] [--onto <newbase>] <upstream> [<branch>]

git-rebase --continue | --skip | --abort

DESCRIPTION

@@ -420,6 +420,14 @@ desired resolution, you can continue the rebasing process with

head, git-merge-octopus otherwise). This implies --merge.

+
+-v, --verbose +
+
+

+ Display a diffstat of what changed upstream since the last rebase. +

+

MERGE STRATEGIES

@@ -508,7 +516,7 @@ a rebase. Upon completion, <branch> will be the current branch.

diff --git a/git-rebase.txt b/git-rebase.txt index 9d7bcaa38..10f2924f4 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -7,7 +7,7 @@ git-rebase - Rebase local commits to a new head SYNOPSIS -------- -'git-rebase' [--merge] [--onto ] [] +'git-rebase' [-v] [--merge] [--onto ] [] 'git-rebase' --continue | --skip | --abort @@ -121,6 +121,9 @@ OPTIONS is used instead (`git-merge-recursive` when merging a single head, `git-merge-octopus` otherwise). This implies --merge. +-v, \--verbose:: + Display a diffstat of what changed upstream since the last rebase. + include::merge-strategies.txt[] NOTES diff --git a/git-rev-parse.html b/git-rev-parse.html index c9005d772..228603a99 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -473,7 +473,9 @@ distinguish between them.

A revision parameter typically, but not necessarily, names a commit object. They use what is called an extended SHA1 -syntax.

+syntax. Here are various ways to spell object names. The +ones listed near the end of this list are to name trees and +blobs contained in a commit.

  • @@ -486,6 +488,12 @@ The full SHA1 object name (40-byte hexadecimal string), or

  • +An output from git-describe; i.e. a closest tag, followed by a + dash, a g, and an abbreviated object name. +

    +
    • +
  • +

    A symbolic ref name. E.g. master typically means the commit object referenced by $GIT_DIR/refs/heads/master. If you happen to have both heads/master and tags/master, you can @@ -538,6 +546,21 @@ A suffix ^ followed by an empty brace pair found.

    • +
  • +

    +A suffix : followed by a path; this names the blob or tree + at the given path in the tree-ish object named by the part + before the colon. +

    +
    • +
  • +

    +A colon, optionally followed by a stage number (0 to 3) and a + colon, followed by a path; this names a blob object in the + index at the given path. Missing stage number (and the colon + that follows it) names an stage 0 entry. +

    +

Here is an illustration, by Jon Loeliger. Both node B and C are a commit parents of commit node A. Parent commits are ordered @@ -614,7 +637,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 2f1306c1d..5d4257062 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -111,7 +111,9 @@ SPECIFYING REVISIONS A revision parameter typically, but not necessarily, names a commit object. They use what is called an 'extended SHA1' -syntax. +syntax. Here are various ways to spell object names. The +ones listed near the end of this list are to name trees and +blobs contained in a commit. * The full SHA1 object name (40-byte hexadecimal string), or a substring of such that is unique within the repository. @@ -119,6 +121,9 @@ syntax. name the same commit object if there are no other object in your repository whose object name starts with dae86e. +* An output from `git-describe`; i.e. a closest tag, followed by a + dash, a 'g', and an abbreviated object name. + * A symbolic ref name. E.g. 'master' typically means the commit object referenced by $GIT_DIR/refs/heads/master. If you happen to have both heads/master and tags/master, you can @@ -156,6 +161,15 @@ syntax. and dereference the tag recursively until a non-tag object is found. +* A suffix ':' followed by a path; this names the blob or tree + at the given path in the tree-ish object named by the part + before the colon. + +* A colon, optionally followed by a stage number (0 to 3) and a + colon, followed by a path; this names a blob object in the + index at the given path. Missing stage number (and the colon + that follows it) names an stage 0 entry. + Here is an illustration, by Jon Loeliger. Both node B and C are a commit parents of commit node A. Parent commits are ordered left-to-right. -- 2.26.2