From 07b88a00c0caac055a9f52167523248a75711842 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Fri, 6 Jan 2012 14:08:02 +0100 Subject: Documentation: rerere.enabled is the primary way to configure rerere The wording seems to suggest that creating the directory is needed and the setting of rerere.enabled is only for disabling the feature by setting it to 'false'. But the configuration is meant to be the primary control and setting it to 'true' will enable it; the rr-cache directory will be created as necessary and the user does not have to create it. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- Documentation/config.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 87643882f..18ab1ae65 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1700,10 +1700,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 -- cgit v1.2.1 From 5f4d133fca7eb3cb750f056a6fd0281ba06cd12f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 6 Jan 2012 12:41:39 -0800 Subject: Git 1.7.8.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.8.3.txt | 16 ++++++++++++++++ Documentation/git.txt | 5 ++++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.7.8.3.txt diff --git a/Documentation/RelNotes/1.7.8.3.txt b/Documentation/RelNotes/1.7.8.3.txt new file mode 100644 index 000000000..a92714c14 --- /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/git.txt b/Documentation/git.txt index da7d48787..8a77fa47a 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] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 36ae50b8f..3d2a089ad 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.8.2 +DEF_VER=v1.7.8.3 LF=' ' diff --git a/RelNotes b/RelNotes index d30cd7e62..70bbc741e 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.8.2.txt \ No newline at end of file +Documentation/RelNotes/1.7.8.3.txt \ No newline at end of file -- cgit v1.2.1