GIT 1.5.0.3
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/Documentation/RelNotes-1.5.0.3.txt b/Documentation/RelNotes-1.5.0.3.txt
index 90b49cf..cd500f9 100644
--- a/Documentation/RelNotes-1.5.0.3.txt
+++ b/Documentation/RelNotes-1.5.0.3.txt
@@ -1,4 +1,4 @@
-GIT v1.5.0.2 Release Notes
+GIT v1.5.0.3 Release Notes
==========================
Fixes since v1.5.0.2
@@ -15,6 +15,10 @@
path. Earlier it started in the middle of the path, and
incorrectly.
+ - 'git-merge' did not exit with non-zero status when the
+ working tree was dirty and cannot fast forward. It does
+ now.
+
- 'cvsexportcommit' does not lose yet-to-be-used message file.
- int-vs-size_t typefix when running combined diff on files
@@ -38,18 +42,17 @@
- 'git index-pack' did not protect itself from getting a short
read out of pread(2).
+ - 'git http-push' had a few buffer overruns.
+
+ - Build dependency fixes to rebuild fetch.o when other headers
+ change.
+
* Documentation updates
- - options to 'git remote add' were described insufficiently.
+ - user-manual updates.
+ - Options to 'git remote add' were described insufficiently.
----
-exec >/var/tmp/1
-O=v1.5.0.2
-O=v1.5.0.2-16-gdb554bf
-echo O=`git describe maint`
-git shortlog --no-merges $O..maint
+ - Configuration format.suffix was not documented.
-# Local Variables:
-# mode: text
-# End:
+ - Other formatting and spelling fixes.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 32a9422..05f9359 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.0.2.GIT
+DEF_VER=v1.5.0.3.GIT
LF='
'
