diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:42:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:42:48 -0800 |
| commit | 21c6a18c75cb48aaedffa6c95d6ff0076ffc6e1e (patch) | |
| tree | a4b6a354c97fba5f83ad45d1c5e9b90f68d62dd9 | |
| parent | Merge branch 'maint' (diff) | |
| parent | Git 1.7.8.3 (diff) | |
| download | tgif-21c6a18c75cb48aaedffa6c95d6ff0076ffc6e1e.tar.xz | |
Sync with 1.7.8.3
| -rw-r--r-- | Documentation/RelNotes/1.7.8.3.txt | 16 | ||||
| -rw-r--r-- | Documentation/config.txt | 8 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 |
3 files changed, 24 insertions, 5 deletions
diff --git a/Documentation/RelNotes/1.7.8.3.txt b/Documentation/RelNotes/1.7.8.3.txt new file mode 100644 index 0000000000..a92714c14b --- /dev/null +++ b/Documentation/RelNotes/1.7.8.3.txt @@ -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. diff --git a/Documentation/config.txt b/Documentation/config.txt index 6e63b5938f..27c7689007 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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 diff --git a/Documentation/git.txt b/Documentation/git.txt index da7d48787e..8a77fa47ad 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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] |