diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:07 -0800 |
| commit | 5de89d3abfca98b0dfd0280d28576940c913d60d (patch) | |
| tree | ce339497e72abc84f4a1bbc9b270b07ab46dbc0c /Documentation/RelNotes | |
| parent | Merge branch 'jm/stash-diff-disambiguate' (diff) | |
| parent | log --show-signature: reword the common two-head merge case (diff) | |
| download | tgif-5de89d3abfca98b0dfd0280d28576940c913d60d.tar.xz | |
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/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/1.7.9.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/RelNotes/1.7.9.txt b/Documentation/RelNotes/1.7.9.txt index 9689efa986..1c548d9436 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 |