aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-02 10:29:00 -0800
committerJunio C Hamano <gitster@pobox.com>2009-12-02 10:29:00 -0800
commit28044baba6d268d91057398ffa041ee1b931a5e0 (patch)
treeba0d4af84f6aaf8b0693962c699e8b787d8a160c
parentce9d823b9141756b5e60aa6c62653adb08e7213b (diff)
downloadgit-28044baba6d268d91057398ffa041ee1b931a5e0.tar.gz
git-28044baba6d268d91057398ffa041ee1b931a5e0.tar.xz
Prepare for 1.6.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.6.5.4.txt32
l---------RelNotes2
2 files changed, 33 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.6.5.4.txt b/Documentation/RelNotes-1.6.5.4.txt
new file mode 100644
index 000000000..e42f8b239
--- /dev/null
+++ b/Documentation/RelNotes-1.6.5.4.txt
@@ -0,0 +1,32 @@
+Git v1.6.5.4 Release Notes
+==========================
+
+Fixes since v1.6.5.3
+--------------------
+
+ * "git help" (without argument) used to check if you are in a directory
+ under git control. There was no breakage in behaviour per-se, but this
+ was unnecessary.
+
+ * "git prune-packed" gave progress output even when its standard error is
+ not connected to a terminal; this caused cron jobs that run it to
+ produce crufts.
+
+ * "git pack-objects --all-progress" is an option to ask progress output
+ from write-object phase _if_ progress output were to be produced, and
+ shouldn't have forced the progress output.
+
+ * "git apply -p<n> --directory=<elsewhere>" did not work well for a
+ non-default value of n.
+
+ * "git merge foo HEAD" was misparsed as an old-style invocation of the
+ command and produced a confusing error message. As it does not specify
+ any other branch to merge, it shouldn't be mistaken as such. We will
+ remove the old style "git merge <message> HEAD <commit>..." syntax in
+ future versions, but not in this release,
+
+ * "git merge -m <message> <branch>..." added the standard merge message
+ on its own after user-supplied message, which should have overrided the
+ standard one.
+
+Other minor documentation updates are included.
diff --git a/RelNotes b/RelNotes
index a6a1c01f7..918bab855 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.5.3.txt \ No newline at end of file
+Documentation/RelNotes-1.6.5.4.txt \ No newline at end of file