From ee62a7b284d15bc30fbbca7fd3bf86710de148bc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 May 2007 07:07:37 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2-rc1-20-g86b9 --- config.txt | 2 +- git-config.html | 4 ++-- git-mergetool.html | 4 ++-- git-mergetool.txt | 2 +- git-tag.html | 12 +++++++----- git-tag.txt | 5 ++++- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/config.txt b/config.txt index c257cdf52..24f9655fe 100644 --- a/config.txt +++ b/config.txt @@ -520,7 +520,7 @@ merge.summary:: merge.tool:: Controls which merge resolution program is used by gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge", "vimdiff" + "meld", "xxdiff", "emerge", "vimdiff", and "opendiff" merge.verbosity:: Controls the amount of output shown by the recursive merge diff --git a/git-config.html b/git-config.html index 9ec7136fc..74bccbfc6 100644 --- a/git-config.html +++ b/git-config.html @@ -1370,7 +1370,7 @@ merge.tool

Controls which merge resolution program is used by git-mergetool(l). Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge", "vimdiff" + "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"

@@ -1654,7 +1654,7 @@ transfer.unpackLimit diff --git a/git-mergetool.html b/git-mergetool.html index c11ca0730..0601ca696 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -293,7 +293,7 @@ with merge conflicts.

Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff

If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the @@ -316,7 +316,7 @@ will pick a suitable default.

diff --git a/git-mergetool.txt b/git-mergetool.txt index 34288fe08..add01e855 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=:: Use the merge resolution program specified by . Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the diff --git a/git-tag.html b/git-tag.html index 57989527a..80358e084 100644 --- a/git-tag.html +++ b/git-tag.html @@ -273,9 +273,10 @@ git-tag(1) Manual Page

SYNOPSIS

-
git-tag [-a | -s | -u <key-id>] [-f | -v] [-m <msg> | -F <file>] <name> [<head>] +
git-tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <name> [<head>] git-tag -d <name>… -git-tag -l [<pattern>]
+git-tag -l [<pattern>] +git-tag -v <name>

DESCRIPTION

@@ -381,9 +382,10 @@ if no pattern is given).

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>
+
[user]
+    signingkey = <gpg-key-id>

DISCUSSION

@@ -519,7 +521,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.<
diff --git a/git-tag.txt b/git-tag.txt index 70235e8dd..4e3e02756 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -9,9 +9,10 @@ git-tag - Create, list, delete or verify a tag object signed with GPG SYNOPSIS -------- [verse] -'git-tag' [-a | -s | -u ] [-f | -v] [-m | -F ] [] +'git-tag' [-a | -s | -u ] [-f] [-m | -F ] [] 'git-tag' -d ... 'git-tag' -l [] +'git-tag' -v DESCRIPTION ----------- @@ -77,8 +78,10 @@ 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 = +------------------------------------- DISCUSSION -- 2.26.2