From: Junio C Hamano Date: Sun, 28 Jan 2007 10:29:21 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc2-61-g1b60 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a890c4fca84a2a5c7835fe6432ede3e7c4e5426b;p=git.git Autogenerated HTML docs for v1.5.0-rc2-61-g1b60 --- diff --git a/config.txt b/config.txt index 3f2fa09a8..6ea7c76a6 100644 --- a/config.txt +++ b/config.txt @@ -469,6 +469,13 @@ user.name:: Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' environment variables. See gitlink:git-commit-tree[1]. +user.signingkey:: + If gitlink:git-tag[1] is not selecting the key you want it to + automatically when creating a signed tag, you can override the + default selection with this variable. This option is passed + unchanged to gpg's --local-user parameter, so you may specify a key + using any method that gpg supports. + whatchanged.difftree:: The default gitlink:git-diff-tree[1] arguments to be used for gitlink:git-whatchanged[1]. diff --git a/diff-options.txt b/diff-options.txt index da1cc60e9..019a39f2b 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -58,6 +58,10 @@ Turn off rename detection, even when the configuration file gives the default to do so. +--check:: + Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. + --full-index:: Instead of the first handful characters, show full object name of pre- and post-image blob on the "index" diff --git a/git-describe.html b/git-describe.html index 536fbbbe6..3ea1ff508 100644 --- a/git-describe.html +++ b/git-describe.html @@ -278,8 +278,8 @@ git-describe(1) Manual Page

The command finds the most recent tag that is reachable from a commit, and if the commit itself is pointed at by the tag, shows -the tag. Otherwise, it suffixes the tag name with abbreviated -object name of the commit.

+the tag. Otherwise, it suffixes the tag name with the number of +additional commits and the abbreviated object name of the commit.

OPTIONS

@@ -348,12 +348,17 @@ object name of the commit.

[torvalds@g5 git]$ git-describe parent
-v1.0.4-g2414721b
+v1.0.4-14-g2414721

i.e. the current head of my "parent" branch is based on v1.0.4, -but since it has a few commits on top of that, it has added the -git hash of the thing to the end: "-g" + 8-char shorthand for -the commit 2414721b194453f058079d897d13c4e377f92dc6.

+but since it has a handful commits on top of that, +describe has added the number of additional commits ("14") and +an abbreviated object name for the commit itself ("2414721") +at the end.

+

The number of additional commits is the number +of commits which would be displayed by "git log v1.0.4..parent". +The hash suffix is "-g" + 7-char abbreviation for the tip commit +of parent (which was 2414721b194453f058079d897d13c4e377f92dc6).

Doing a "git-describe" on a tag-name will just show the tag name:

@@ -365,12 +370,19 @@ the output shows the reference path as well:

[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2
-tags/v1.0.0-g975b
+tags/v1.0.0-21-g975b 
[torvalds@g5 git]$ git describe --all HEAD^
-heads/lt/describe-g975b
+heads/lt/describe-7-g975b +
+

With --abbrev set to 0, the command can be used to find the +closest tagname without any suffix:

+
+
+
[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2
+tags/v1.0.0

SEARCH STRATEGY

@@ -393,7 +405,8 @@ will be the smallest number of commits possible.

Author

Written by Linus Torvalds <torvalds@osdl.org>, but somewhat -butchered by Junio C Hamano <junkio@cox.net>

+butchered by Junio C Hamano <junkio@cox.net>. Later significantly +updated by Shawn Pearce <spearce@spearce.org>.

Documentation

@@ -405,7 +418,7 @@ butchered by Junio C Hamano <junkio@cox.net>

diff --git a/git-describe.txt b/git-describe.txt index b87783cf0..47a583d3a 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -14,8 +14,8 @@ DESCRIPTION ----------- The command finds the most recent tag that is reachable from a commit, and if the commit itself is pointed at by the tag, shows -the tag. Otherwise, it suffixes the tag name with abbreviated -object name of the commit. +the tag. Otherwise, it suffixes the tag name with the number of +additional commits and the abbreviated object name of the commit. OPTIONS @@ -52,12 +52,18 @@ EXAMPLES With something like git.git current tree, I get: [torvalds@g5 git]$ git-describe parent - v1.0.4-g2414721b + v1.0.4-14-g2414721 i.e. the current head of my "parent" branch is based on v1.0.4, -but since it has a few commits on top of that, it has added the -git hash of the thing to the end: "-g" + 8-char shorthand for -the commit `2414721b194453f058079d897d13c4e377f92dc6`. +but since it has a handful commits on top of that, +describe has added the number of additional commits ("14") and +an abbreviated object name for the commit itself ("2414721") +at the end. + +The number of additional commits is the number +of commits which would be displayed by "git log v1.0.4..parent". +The hash suffix is "-g" + 7-char abbreviation for the tip commit +of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). Doing a "git-describe" on a tag-name will just show the tag name: @@ -68,10 +74,16 @@ With --all, the command can use branch heads as references, so the output shows the reference path as well: [torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2 - tags/v1.0.0-g975b + tags/v1.0.0-21-g975b [torvalds@g5 git]$ git describe --all HEAD^ - heads/lt/describe-g975b + heads/lt/describe-7-g975b + +With --abbrev set to 0, the command can be used to find the +closest tagname without any suffix: + + [torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2 + tags/v1.0.0 SEARCH STRATEGY --------------- @@ -97,7 +109,8 @@ will be the smallest number of commits possible. Author ------ Written by Linus Torvalds , but somewhat -butchered by Junio C Hamano +butchered by Junio C Hamano . Later significantly +updated by Shawn Pearce . Documentation -------------- diff --git a/git-diff-files.html b/git-diff-files.html index a755740bb..ea184a542 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -425,6 +425,15 @@ same as "git-diff-index" and "git-diff-tree".

+--check +
+
+

+ Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. +

+
+
--full-index
@@ -986,7 +995,7 @@ two unresolved merge parents with the working tree file
diff --git a/git-diff-index.html b/git-diff-index.html index ec23f3d78..a0d25fb44 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -426,6 +426,15 @@ entries in the index are compared.

+--check +
+
+

+ Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. +

+
+
--full-index
@@ -1076,7 +1085,7 @@ always have the special all-zero sha1.
diff --git a/git-diff-stages.html b/git-diff-stages.html index 1cefce391..8fc33a4f7 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -423,6 +423,15 @@ unmerged index file.

+--check +
+
+

+ Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. +

+
+
--full-index
@@ -960,7 +969,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 61e5b019f..89f313911 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -428,6 +428,15 @@ git-diff-tree(1) Manual Page

+--check +
+
+

+ Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. +

+
+
--full-index
@@ -1280,7 +1289,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 899b6e271..8374fdb26 100644 --- a/git-diff.html +++ b/git-diff.html @@ -474,6 +474,15 @@ any <tree-ish>.

+--check +
+
+

+ Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. +

+
+
--full-index
@@ -819,7 +828,7 @@ output diff in reverse. diff --git a/git-repo-config.html b/git-repo-config.html index 097a0a299..07a6b5122 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -1311,6 +1311,18 @@ user.name

+user.signingkey +
+
+

+ If git-tag(1) is not selecting the key you want it to + automatically when creating a signed tag, you can override the + default selection with this variable. This option is passed + unchanged to gpg's --local-user parameter, so you may specify a key + using any method that gpg supports. +

+
+
whatchanged.difftree
@@ -1378,7 +1390,7 @@ transfer.unpackLimit diff --git a/git-tag.html b/git-tag.html index 727ec47ce..d3609a826 100644 --- a/git-tag.html +++ b/git-tag.html @@ -375,6 +375,17 @@ if no pattern is given).

+

CONFIGURATION

+
+

By default, git-tag in sign-with-default mode (-s) will use your +committer identity (of the form "Your Name <your@email.address>") to +find a key. If you want to use a different default key, you can specify +it in the repository configuration as follows:

+
+
+
signingkey = <gpg-key-id>
+
+

Author

Written by Linus Torvalds <torvalds@osdl.org>, @@ -390,7 +401,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.<

diff --git a/git-tag.txt b/git-tag.txt index 13c7aefbf..3f01e0bfc 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -70,6 +70,16 @@ OPTIONS Take the tag message from the given file. Use '-' to read the message from the standard input. +CONFIGURATION +------------- +By default, git-tag in sign-with-default mode (-s) will use your +committer identity (of the form "Your Name ") to +find a key. If you want to use a different default key, you can specify +it in the repository configuration as follows: + +[user] + signingkey = + Author ------ Written by Linus Torvalds , diff --git a/git.html b/git.html index 76c121c43..e1910cdb2 100644 --- a/git.html +++ b/git.html @@ -2285,7 +2285,7 @@ contributors on the git-list <git@vger.kernel.org>.