aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-26 17:14:03 -0700
committerJunio C Hamano <gitster@pobox.com>2008-06-26 17:14:03 -0700
commit53b22a9e45161004ff3260782abc4ee2a5b3e730 (patch)
tree0d12b068502c3cc0512ec44628c26f75c6438b16 /Documentation
parent4afbcab9898ce63ad641dd0de6e9b69deda44330 (diff)
parent872354dcb3ce5f34f7ddb12d2c89d26a1ea4daf0 (diff)
downloadgit-53b22a9e45161004ff3260782abc4ee2a5b3e730.tar.gz
git-53b22a9e45161004ff3260782abc4ee2a5b3e730.tar.xz
Merge branch 'maint-1.5.4' into maint-1.5.5
* maint-1.5.4: GIT 1.5.4.6 git-shell: accept "git foo" form Conflicts: GIT-VERSION-GEN RelNotes
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.4.6.txt43
1 files changed, 43 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.5.4.6.txt b/Documentation/RelNotes-1.5.4.6.txt
new file mode 100644
index 000000000..3e3c3e55a
--- /dev/null
+++ b/Documentation/RelNotes-1.5.4.6.txt
@@ -0,0 +1,43 @@
+GIT v1.5.4.6 Release Notes
+==========================
+
+I personally do not think there is any reason anybody should want to
+run v1.5.4.X series these days, because 'master' version is always
+more stable than any tagged released version of git.
+
+This is primarily to futureproof "git-shell" to accept requests
+without a dash between "git" and subcommand name (e.g. "git
+upload-pack") which the newer client will start to make sometime in
+the future.
+
+Fixes since v1.5.4.5
+--------------------
+
+ * Command line option "-n" to "git-repack" was not correctly parsed.
+
+ * Error messages from "git-apply" when the patchfile cannot be opened
+ have been improved.
+
+ * Error messages from "git-bisect" when given nonsense revisions have
+ been improved.
+
+ * reflog syntax that uses time e.g. "HEAD@{10 seconds ago}:path" did not
+ stop parsing at the closing "}".
+
+ * "git rev-parse --symbolic-full-name ^master^2" printed solitary "^",
+ but it should print nothing.
+
+ * "git apply" did not enforce "match at the beginning" correctly.
+
+ * a path specification "a/b" in .gitattributes file should not match
+ "sub/a/b", but it did.
+
+ * "git log --date-order --topo-order" did not override the earlier
+ date-order with topo-order as expected.
+
+ * "git fast-export" did not export octopus merges correctly.
+
+ * "git archive --prefix=$path/" mishandled gitattributes.
+
+As usual, it also comes with many documentation fixes and clarifications.
+