global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Git 1.7.9-rc0
  Git 1.7.8.3
  Documentation: rerere.enabled is the primary way to configure rerere
This commit is contained in:
Junio C Hamano
2012-01-06 12:51:46 -08:00
parent bcf3818bb0 eac2d83247
commit 153869598b
5 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Documentation/RelNotes/1.7.8.3.txt Normal file
View File

@@ -0,0 +1,16 @@
Git v1.7.8.3 Release Notes
==========================
Fixes since v1.7.8.2
--------------------
* Attempt to fetch from an empty file pretending it to be a bundle did
not error out correctly.
* gitweb did not correctly fall back to configured $fallback_encoding
that is not 'latin1'.
* "git clone --depth $n" did not catch a non-number given as $n as an
error.
Also contains minor fixes and documentation updates.

11
Documentation/RelNotes/1.7.9.txt
View File

@@ -48,6 +48,9 @@ Updates since v1.7.8
* "git commit" detects and rejects an attempt to stuff NUL byte in
the commit log message.
* "git commit" learned "-S" to GPG-sign the commit; this can be shown
with the "--show-signature" option to "git log".
* fsck and prune are relatively lengthy operations that still go
silent while making the end-user wait. They learned to give progress
output like other slow operations.
@@ -64,6 +67,10 @@ Updates since v1.7.8
signed tag is recorded in the resulting merge commit for later
auditing.
* "git log" learned "--show-signature" option to show the signed tag
that was merged that is embedded in the merge commit. It also can
show the signature made on the commit with "git commit -S".
* "git branch --edit-description" can be used to add descriptive text
to explain what a topic branch is about.
@@ -99,10 +106,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

8
Documentation/config.txt
View File

@@ -1783,10 +1783,10 @@ rerere.autoupdate::
rerere.enabled::
Activate recording of resolved conflicts, so that identical
conflict hunks can be resolved automatically, should they
be encountered again. linkgit:git-rerere[1] command is by
default enabled if you create `rr-cache` directory under
`$GIT_DIR`, but can be disabled by setting this option to false.
conflict hunks can be resolved automatically, should they be
encountered again. By default, linkgit:git-rerere[1] is
enabled if there is an `rr-cache` directory under the
`$GIT_DIR`.
sendemail.identity::
A configuration identity. When given, causes values in the

5
Documentation/git.txt
View File

@@ -44,9 +44,12 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.7.8/git.html[documentation for release 1.7.8]
* link:v1.7.8.3/git.html[documentation for release 1.7.8.3]
* release notes for
link:RelNotes/1.7.8.3.txt[1.7.8.3],
link:RelNotes/1.7.8.2.txt[1.7.8.2],
link:RelNotes/1.7.8.1.txt[1.7.8.1],
link:RelNotes/1.7.8.txt[1.7.8].
* link:v1.7.7.5/git.html[documentation for release 1.7.7.5]

2
GIT-VERSION-GEN
View File

@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=v1.7.8.GIT
DEF_VER=v1.7.9-rc0
LF='
'