summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-27 11:15:09 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-27 11:15:09 +0900
commit0c24fdc2562be87c9f57fc224e634566c9454a15 (patch)
treeb4a98d6daecbdeccf69dcdf68603a70d893b0d39
parentc2b6135a1b52a567c92286bb1d3345b6cb0db584 (diff)
parent7bc77766e127d94afe67a3fd900105514b6659dd (diff)
downloadgit-0c24fdc2562be87c9f57fc224e634566c9454a15.tar.gz
Sync with maint
* maint: A bit more fixes for 2.15.1 RelNotes: minor typo fixes in 2.15.1 draft
-rw-r--r--Documentation/RelNotes/2.15.1.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt
index 47f23b56fe..a6ae4c1aeb 100644
--- a/Documentation/RelNotes/2.15.1.txt
+++ b/Documentation/RelNotes/2.15.1.txt
@@ -13,7 +13,7 @@ Fixes since v2.15
latter, which has been fixed.
* The experimental "color moved lines differently in diff output"
- feature was buggy around "ignore whitespace changes" edges, whihch
+ feature was buggy around "ignore whitespace changes" edges, which
has been corrected.
* Instead of using custom line comparison and hashing functions to
@@ -24,7 +24,7 @@ Fixes since v2.15
HEAD points at, which have been fixed.
* "git commit", after making a commit, did not check for errors when
- asking on what branch it made the commit, which has been correted.
+ asking on what branch it made the commit, which has been corrected.
* "git status --ignored -u" did not stop at a working tree of a
separate project that is embedded in an ignored directory and
@@ -35,7 +35,7 @@ Fixes since v2.15
--recurse-submodules" has been fixed.
* A recent regression in "git rebase -i" that broke execution of git
- commands from subdirectories via "exec" insn has been fixed.
+ commands from subdirectories via "exec" instruction has been fixed.
* "git check-ref-format --branch @{-1}" bit a "BUG()" when run
outside a repository for obvious reasons; clarify the documentation
@@ -76,5 +76,10 @@ Fixes since v2.15
* We used to add an empty alternate object database to the system
that does not help anything; it has been corrected.
+ * Error checking in "git imap-send" for empty response has been
+ improved.
+
+ * An ancient bug in "git apply --ignore-space-change" codepath has
+ been fixed.
Also contains various documentation updates and code clean-ups.