aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-03 22:51:56 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-03 22:51:56 -0700
commit9831b370b5e50b81faf47d858cd8c6e9e2200204 (patch)
tree015195b83ceaa5c681684f4bc6ede43c8c4f09d8 /Documentation
parent2414b45ce0c56f7744e00e7fef3682a77375701e (diff)
parent6c7f58d6f691c1091b90b0891e94c91e20fd6054 (diff)
downloadgit-9831b370b5e50b81faf47d858cd8c6e9e2200204.tar.gz
git-9831b370b5e50b81faf47d858cd8c6e9e2200204.tar.xz
Merge branch 'maint' to sync with 1.6.3.2
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.6.3.2.txt12
1 files changed, 5 insertions, 7 deletions
diff --git a/Documentation/RelNotes-1.6.3.2.txt b/Documentation/RelNotes-1.6.3.2.txt
index 0b48d1a1d..b2f3f0293 100644
--- a/Documentation/RelNotes-1.6.3.2.txt
+++ b/Documentation/RelNotes-1.6.3.2.txt
@@ -37,13 +37,17 @@ Fixes since v1.6.3.1
the first hunk that adds a line at the top was split into two and
both halves are marked to be used.
+ * "git blame path" misbehaved at the commit where path became file
+ from a directory with some files in it.
+
* "git for-each-ref" had a segfaulting bug when dealing with a tag object
created by an ancient git.
* "git format-patch -k" still added patch numbers if format.numbered
configuration was set.
- * "git grep --color ''" did not terminate.
+ * "git grep --color ''" did not terminate. The command also had
+ subtle bugs with its -w option.
* http-push had a small use-after-free bug.
@@ -55,9 +59,3 @@ Fixes since v1.6.3.1
Many other general usability updates around help text, diagnostic messages
and documentation are included as well.
-
----
-exec >/var/tmp/1
-O=v1.6.3.1-68-g456cb4c
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint