From: Junio C Hamano <junkio@cox.net>
Date: Sun, 18 Mar 2007 21:40:35 +0000 (-0700)
Subject: GIT 1.5.0.5
X-Git-Tag: v1.5.0.5^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6bf035f2780bde45682e0edf40e35a150bd83706;p=git.git

GIT 1.5.0.5

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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
+
+
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6188415c5..3f41a87be 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -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='
 '
diff --git a/RelNotes b/RelNotes
index 4e8ff2eb7..8877578a8 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.0.4.txt
\ No newline at end of file
+Documentation/RelNotes-1.5.0.5.txt
\ No newline at end of file