diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 20:44:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 20:44:07 (GMT) |
| commit | 5de89d3abfca98b0dfd0280d28576940c913d60d (patch) | |
| tree | ce339497e72abc84f4a1bbc9b270b07ab46dbc0c /Documentation | |
| parent | 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 (diff) | |
| parent | d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb (diff) | |
| download | git-5de89d3abfca98b0dfd0280d28576940c913d60d.zip git-5de89d3abfca98b0dfd0280d28576940c913d60d.tar.gz git-5de89d3abfca98b0dfd0280d28576940c913d60d.tar.bz2 | |
Merge branch 'jc/show-sig'
* jc/show-sig:
log --show-signature: reword the common two-head merge case
log-tree: show mergetag in log --show-signature output
log-tree.c: small refactor in show_signature()
commit --amend -S: strip existing gpgsig headers
verify_signed_buffer: fix stale comment
gpg-interface: allow use of a custom GPG binary
pretty: %G[?GS] placeholders
test "commit -S" and "log --show-signature"
log: --show-signature
commit: teach --gpg-sign option
Conflicts:
builtin/commit-tree.c
builtin/commit.c
builtin/merge.c
notes-cache.c
pretty.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.9.txt | 4 | ||||
| -rw-r--r-- | Documentation/config.txt | 11 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/Documentation/RelNotes/1.7.9.txt b/Documentation/RelNotes/1.7.9.txt index 9689efa..1c548d9 100644 --- a/Documentation/RelNotes/1.7.9.txt +++ b/Documentation/RelNotes/1.7.9.txt @@ -99,10 +99,6 @@ Unless otherwise noted, all the fixes since v1.7.8 in the maintenance releases are contained in this release (see release notes to them for details). - * gitweb did not correctly fall back to configured $fallback_encoding - that is not 'latin1'. - (merge b13e3ea jn/maint-gitweb-utf8-fix later to maint). - -- exec >/var/tmp/1 O=v1.7.8.2-301-g48de656 diff --git a/Documentation/config.txt b/Documentation/config.txt index 27c7689..04f5e19 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1123,6 +1123,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. diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 622a019..53ff5f6 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -38,7 +38,9 @@ created (i.e. a lightweight tag). A GnuPG signed tag object will be created when `-s` or `-u <key-id>` is used. When `-u <key-id>` is not used, the committer identity for the current user is used to find the -GnuPG key for signing. +GnuPG key for signing. The configuration variable `gpg.program` +is used to specify custom GnuPG binary. + OPTIONS ------- @@ -48,11 +50,11 @@ OPTIONS -s:: --sign:: - Make a GPG-signed tag, using the default e-mail address's key + Make a GPG-signed tag, using the default e-mail address's key. -u <key-id>:: --local-user=<key-id>:: - Make a GPG-signed tag, using the given key + Make a GPG-signed tag, using the given key. -f:: --force:: |