.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CONFIG" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-CONFIG" "1" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Whether to include summaries of merged commits in newly created merge commit messages. False by default.
.TP
merge.tool
-Controls which merge resolution program is used by \fBgit\-mergetool\fR(l). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff"
+Controls which merge resolution program is used by \fBgit\-mergetool\fR(l). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
.TP
merge.verbosity
Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-MERGETOOL" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGETOOL" "1" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "OPTIONS"
.TP
\-t or \-\-tool=<tool>
-Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
+Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
If a merge resolution program is not specified, \fIgit mergetool\fR will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, \fIgit mergetool\fR will pick a suitable default.
.SH "AUTHOR"
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-TAG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-TAG" "1" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
.sp
.nf
-\fIgit\-tag\fR [\-a | \-s | \-u <key\-id>] [\-f | \-v] [\-m <msg> | \-F <file>] <name> [<head>]
+\fIgit\-tag\fR [\-a | \-s | \-u <key\-id>] [\-f] [\-m <msg> | \-F <file>] <name> [<head>]
\fIgit\-tag\fR \-d <name>\&...
\fIgit\-tag\fR \-l [<pattern>]
+\fIgit\-tag\fR \-v <name>
.fi
.SH "DESCRIPTION"
Adds a \fItag\fR reference in .git/refs/tags/
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:
.sp
.nf
-signingkey = <gpg\-key\-id>
+[user]
+ signingkey = <gpg\-key\-id>
.fi
.SH "DISCUSSION"
.SS "On Re\-tagging"