From 4f021b34f2d5b775690f63796a2973753660c8a8 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 25 Feb 2013 00:27:20 -0500 Subject: [PATCH 1/2] Documentation: "advice" is uncountable "Advice" is a mass noun, not a count noun; it's not ordinarily pluralized. Signed-off-by: Greg Price Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- t/t7512-status-help.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index e452ff89b..dbb2faf60 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -168,7 +168,7 @@ advice.*:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. resolveConflict:: - Advices shown by various commands when conflicts + Advice shown by various commands when conflicts prevent the operation from being performed. implicitIdentity:: Advice on how to set your identity configuration when diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index b3f6eb9c6..95d651080 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -5,7 +5,7 @@ # Grenoble INP Ensimag # -test_description='git status advices' +test_description='git status advice' . ./test-lib.sh From 7a0d8db36e1256fd2ac9fa6b97b947e536c2202b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Feb 2013 08:15:40 -0800 Subject: [PATCH 2/2] Prepare for 1.8.1.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.1.5.txt | 37 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.8.1.5.txt diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.txt new file mode 100644 index 000000000..92da6b277 --- /dev/null +++ b/Documentation/RelNotes/1.8.1.5.txt @@ -0,0 +1,37 @@ +Git 1.8.1.5 Release Notes +========================= + +Fixes since v1.8.1.5 +-------------------- + + * "git apply --summary" has been taught to make sure the similarity + value shown in its output is sensible, even when the input had a + bogus value. + + * "git clean" showed what it was going to do, but sometimes ended + up finding that it was not allowed to do so, which resulted in a + confusing output (e.g. after saying that it will remove an + untracked directory, it found an embedded git repository there + which it is not allowed to remove). It now performs the actions + and then reports the outcome more faithfully. + + * "git clone" used to allow --bare and --separate-git-dir=$there + options at the same time, which was nonsensical. + + * "git cvsimport" mishandled timestamps at DST boundary. + + * We used to have an arbitrary 32 limit for combined diff input, + resulting in incorrect number of leading colons shown when showing + the "--raw --cc" output. + + * The smart HTTP clients forgot to verify the content-type that comes + back from the server side to make sure that the request is being + handled properly. + + * "git help remote-helpers" failed to find the documentation. + + * "gitweb" pages served over HTTPS, when configured to show picon or + gravatar, referred to these external resources to be fetched via + HTTP, resulting in mixed contents warning in browsers. + +Also contains various documentation fixes. diff --git a/RelNotes b/RelNotes index ad613ead7..3c65929a7 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.8.1.4.txt \ No newline at end of file +Documentation/RelNotes/1.8.1.5.txt \ No newline at end of file