diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-05 11:00:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-05 11:00:49 -0800 |
| commit | 9d3d78435f2735b74afc74e9c5a735c27c026d33 (patch) | |
| tree | 8f66df5b090f6163698d66cc9dd7a522ae359dfd /Documentation/config.txt | |
| parent | commit: do not lose mergetag header when not amending (diff) | |
| parent | gpg-interface: allow use of a custom GPG binary (diff) | |
| download | tgif-9d3d78435f2735b74afc74e9c5a735c27c026d33.tar.xz | |
Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'
They both use the extended headers in commit objects, and the former has
necessary infrastructure to show them that is useful to view the result of
the latter.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b30c7e6278..094c1c9de3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1094,6 +1094,17 @@ grep.lineNumber:: grep.extendedRegexp:: If set to true, enable '--extended-regexp' option by default. +gpg.program:: + Use this custom program instead of "gpg" found on $PATH when + making or verifying a PGP signature. The program must support the + same command line interface as GPG, namely, to verify a detached + signature, "gpg --verify $file - <$signature" is run, and the + program is expected to signal a good signature by exiting with + code 0, and to generate an ascii-armored detached signature, the + standard input of "gpg -bsau $key" is fed with the contents to be + signed, and the program is expected to send the result to its + standard output. + gui.commitmsgwidth:: Defines how wide the commit message window is in the linkgit:git-gui[1]. "75" is the default. |