GIT 1.5.0.5

Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-18 14:40:35 -07:00 · 2007-03-18 14:40:35 -07:00 · 6bf035f278
parent 2be08a84ba
commit 6bf035f278
3 changed files with 30 additions and 2 deletions
--- a/Documentation/RelNotes-1.5.0.5.txt
+++ 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
+
+
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 #!/bin/sh

 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.0.4.GIT
+DEF_VER=v1.5.0.5.GIT

 LF='
 '
--- a/2
+++ b/2
@ -1 +1 @@
-Documentation/RelNotes-1.5.0.4.txt
+Documentation/RelNotes-1.5.0.5.txt