diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:27:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:28:06 -0800 |
| commit | 2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4 (patch) | |
| tree | 5bb00d5bc31310536d4816689f577ef75dccf44d | |
| parent | Merge branch 'wk/user-manual' (diff) | |
| parent | Prepare for 1.8.1.5 (diff) | |
| download | tgif-2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4.tar.xz | |
Sync with 'maint'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.8.1.5.txt | 37 | ||||
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rwxr-xr-x | t/t7512-status-help.sh | 2 |
3 files changed, 39 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.txt new file mode 100644 index 0000000000..92da6b2777 --- /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/Documentation/config.txt b/Documentation/config.txt index 3bb53da522..bbba728d09 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -182,7 +182,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 51ab89411f..d2da89a5f5 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 |