aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-18 15:36:44 -0700
committerJunio C Hamano <junkio@cox.net>2007-03-18 15:36:44 -0700
commit5bb44a51038a18f4f940968aed84e6cc26afcebe (patch)
tree08d5e5a61cd2857d01e6cc4f3caa2e8ff07c9a8e
parent1589e0517fd22c198799504d6888d5a475024152 (diff)
parent6bf035f2780bde45682e0edf40e35a150bd83706 (diff)
downloadgit-5bb44a51038a18f4f940968aed84e6cc26afcebe.tar.gz
git-5bb44a51038a18f4f940968aed84e6cc26afcebe.tar.xz
Merge 1.5.0.5 in from 'maint'
-rw-r--r--Documentation/RelNotes-1.5.0.5.txt28
1 files changed, 28 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.5.0.5.txt b/Documentation/RelNotes-1.5.0.5.txt
new file mode 100644
index 000000000..aa86149d4
--- /dev/null
+++ b/Documentation/RelNotes-1.5.0.5.txt
@@ -0,0 +1,28 @@
+GIT v1.5.0.5 Release Notes
+==========================
+
+Fixes since v1.5.0.3
+--------------------
+
+* Bugfixes
+
+ - git-merge (hence git-pull) did not refuse fast-forwarding
+ when the working tree had local changes that would have
+ conflicted with it.
+
+ - git.el does not add duplicate sign-off lines.
+
+ - git-commit shows the full stat of the resulting commit, not
+ just about the files in the current directory, when run from
+ a subdirectory.
+
+ - "git-checkout -m '@{8 hours ago}'" had a funny failure from
+ eval; fixed.
+
+ - git-gui updates.
+
+* Documentation updates
+
+* User manual updates
+
+