aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-11 18:43:01 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-11 18:43:01 -0700
commit566f5b217df73d6a642a0857cc5c13c11f84e7c3 (patch)
treeff172bf2658ca4e1f4c88d30bb80c8af17f29b2d /Documentation
parentb06dcf8cb83a9b7655bad5f0f6d84e68fc78beb3 (diff)
parent9b11d24d4156e0b2246383faad16eb8aa0caeefb (diff)
downloadgit-566f5b217df73d6a642a0857cc5c13c11f84e7c3.tar.gz
git-566f5b217df73d6a642a0857cc5c13c11f84e7c3.tar.xz
Merge branch 'maint'
* maint: GIT 1.5.1.1 cvsserver: Fix handling of diappeared files on update fsck: do not complain on detached HEAD. (encode_85, decode_85): Mark source buffer pointer as "const".
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.1.1.txt29
1 files changed, 22 insertions, 7 deletions
diff --git a/Documentation/RelNotes-1.5.1.1.txt b/Documentation/RelNotes-1.5.1.1.txt
index b48b4bc3e..3054b5a3f 100644
--- a/Documentation/RelNotes-1.5.1.1.txt
+++ b/Documentation/RelNotes-1.5.1.1.txt
@@ -1,4 +1,4 @@
-GIT v1.5.1.1 Release Notes (draft)
+GIT v1.5.1.1 Release Notes
==========================
Fixes since v1.5.1
@@ -10,8 +10,23 @@ Fixes since v1.5.1
- The documentation for cvsimport has been majorly improved.
+ - "git-show-ref --exclude-existing" was documented.
+
* Bugfixes
+ - The implementation of -p option in "git cvsexportcommit" had
+ the meaning of -C (context reduction) option wrong, and
+ loosened the context requirements when it was told to be
+ strict.
+
+ - "git cvsserver" did not behave like the real cvsserver when
+ client side removed a file from the working tree without
+ doing anything else on the path. In such a case, it should
+ restore it from the checked out revision.
+
+ - "git fsck" issued an alarming error message on detached
+ HEAD. It is not an error since at least 1.5.0.
+
- "git send-email" produced of References header of unbounded length;
fixed this with line-folding.
@@ -37,10 +52,10 @@ Fixes since v1.5.1
- gitweb did not show type-changing patch correctly in the
blobdiff view.
-* Performance Tweaks
+ - git-svn did not error out with incorrect command line options.
+
+ - git-svn fell into an infinite loop when insanely long commit
+ message was found.
---
-exec >/var/tmp/1
-O=v1.5.1-26-ge94a4f6
-echo O=`git describe refs/heads/maint`
-git shortlog --no-merges $O..refs/heads/maint
+ - git-svn dcommit and rebase was confused by patches that were
+ merged from another branch that is managed by git-svn.