From 5e284b493e1b24c922c8de3fb1ebcec179039a9c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 22 May 2007 07:23:37 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2-35-ga334 --- config.txt | 5 +++++ git-config.html | 12 +++++++++++- git-describe.html | 14 ++++++++++++-- git-describe.txt | 7 ++++++- git-name-rev.html | 14 +++++++++++++- git-name-rev.txt | 7 +++++++ git-status.html | 6 +++++- git-status.txt | 5 +++++ 8 files changed, 64 insertions(+), 6 deletions(-) diff --git a/config.txt b/config.txt index ee1c35e8e..179cb177d 100644 --- a/config.txt +++ b/config.txt @@ -256,6 +256,11 @@ You probably do not need to adjust this value. + Common unit suffixes of 'k', 'm', or 'g' are supported. +core.excludeFile:: + In addition to '.gitignore' (per-directory) and + '.git/info/exclude', git looks into this file for patterns + of files which are not meant to be tracked. + alias.*:: Command aliases for the gitlink:git[1] command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation diff --git a/git-config.html b/git-config.html index 879001206..a13d1c4f2 100644 --- a/git-config.html +++ b/git-config.html @@ -903,6 +903,16 @@ You probably do not need to adjust this value.

Common unit suffixes of k, m, or g are supported.

+core.excludeFile +
+
+

+ In addition to .gitignore (per-directory) and + .git/info/exclude, git looks into this file for patterns + of files which are not meant to be tracked. +

+
+
alias.*
@@ -1680,7 +1690,7 @@ transfer.unpackLimit diff --git a/git-describe.html b/git-describe.html index e46d249a0..d1ff5bda4 100644 --- a/git-describe.html +++ b/git-describe.html @@ -272,7 +272,7 @@ git-describe(1) Manual Page

SYNOPSIS

-

git-describe [--all] [--tags] [--abbrev=<n>] <committish>…

+

git-describe [--all] [--tags] [--contains] [--abbrev=<n>] <committish>…

DESCRIPTION

@@ -311,6 +311,16 @@ additional commits and the abbreviated object name of the commit.

+--contains +
+
+

+ Instead of finding the tag that predates the commit, find + the tag that comes after the commit, and thus contains it. + Automatically implies --tags. +

+
+
--abbrev=<n>
@@ -418,7 +428,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-describe.txt b/git-describe.txt index 47a583d3a..dc47b65ce 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -8,7 +8,7 @@ git-describe - Show the most recent tag that is reachable from a commit SYNOPSIS -------- -'git-describe' [--all] [--tags] [--abbrev=] ... +'git-describe' [--all] [--tags] [--contains] [--abbrev=] ... DESCRIPTION ----------- @@ -31,6 +31,11 @@ OPTIONS Instead of using only the annotated tags, use any tag found in `.git/refs/tags`. +--contains:: + Instead of finding the tag that predates the commit, find + the tag that comes after the commit, and thus contains it. + Automatically implies --tags. + --abbrev=:: Instead of using the default 8 hexadecimal digits as the abbreviated object name, use digits. diff --git a/git-name-rev.html b/git-name-rev.html index 517e2edbe..80b261b11 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -317,6 +317,18 @@ format parsable by git-rev-parse.

commits, and pass to stdout

+
+--name-only +
+
+

+ Instead of printing both the SHA-1 and the name, print only + the name. If given with --tags the usual tag prefix of + "tags/" is also ommitted from the name, matching the output + of :git-describe(1) more closely. This option + cannot be combined with --stdin. +

+

EXAMPLE

@@ -352,7 +364,7 @@ not the context.

diff --git a/git-name-rev.txt b/git-name-rev.txt index d6c8bf800..9a1645d29 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt @@ -34,6 +34,13 @@ OPTIONS Read from stdin, append "()" to all sha1's of nameable commits, and pass to stdout +--name-only:: + Instead of printing both the SHA-1 and the name, print only + the name. If given with --tags the usual tag prefix of + "tags/" is also ommitted from the name, matching the output + of gitlink::git-describe[1] more closely. This option + cannot be combined with --stdin. + EXAMPLE ------- diff --git a/git-status.html b/git-status.html index a690a15aa..50dd9cd85 100644 --- a/git-status.html +++ b/git-status.html @@ -300,6 +300,10 @@ template comments, and all the output lines are prefixed with #.

mean the same thing and the latter is kept for backward compatibility) and color.status.<slot> configuration variables to colorize its output.

+

As for git-add(1), the configuration variable +core.excludesfile can indicate a path to a file containing patterns +of file names to exclude, in addition to patterns given in +info/exclude and .gitignore.

Author

@@ -316,7 +320,7 @@ Junio C Hamano <junkio@cox.net>.

diff --git a/git-status.txt b/git-status.txt index e9e193f00..d7015387b 100644 --- a/git-status.txt +++ b/git-status.txt @@ -42,6 +42,11 @@ mean the same thing and the latter is kept for backward compatibility) and `color.status.` configuration variables to colorize its output. +As for gitlink:git-add[1], the configuration variable +'core.excludesfile' can indicate a path to a file containing patterns +of file names to exclude, in addition to patterns given in +'info/exclude' and '.gitignore'. + Author ------ -- 2.26.2