1
0
mirror of https://github.com/git/git.git synced 2025-04-18 12:24:40 +00:00

Sync with 1.7.8.3

This commit is contained in:
Junio C Hamano 2012-01-06 12:42:48 -08:00
commit 21c6a18c75
3 changed files with 24 additions and 5 deletions
Documentation

@ -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.

@ -1772,10 +1772,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

@ -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]