Git 1.7.0.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.7.0.4.txt b/Documentation/RelNotes-1.7.0.4.txt
index cbc94a2f08a7a18a22b5e8df880999b2bf3f95a5..cf7f60e60d738bab0f319fc32da41259e177ee35 100644 (file)
--- a/Documentation/RelNotes-1.7.0.4.txt
+++ b/Documentation/RelNotes-1.7.0.4.txt
@@ -1,9 +1,11 @@
-Git v1.7.0.4 Release Notes (draft)
-==================================
+Git v1.7.0.4 Release Notes
+==========================

 
 Fixes since v1.7.0.3
 --------------------
 
 
 Fixes since v1.7.0.3
 --------------------
 

+ * Optimized ntohl/htonl on big-endian machines were broken.
+

  * Color values given to "color.<cmd>.<slot>" configuration can now have
    more than one attributes (e.g. "bold ul").
 
  * Color values given to "color.<cmd>.<slot>" configuration can now have
    more than one attributes (e.g. "bold ul").
 


@@ -16,4 +18,10 @@ Fixes since v1.7.0.3
  * "git fast-export" didn't check error status and stop when marks file
    cannot be opened.
 
  * "git fast-export" didn't check error status and stop when marks file
    cannot be opened.
 

+ * "git format-patch --ignore-if-in-upstream" gave unwarranted errors
+   when the range was empty, instead of silently finishing.
+
+ * "git remote prune" did not detect remote tracking refs that became
+   dangling correctly.
+

 And other minor fixes and documentation updates.
 And other minor fixes and documentation updates.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4e00b315ff7450efb4a48ba184c6d65991d53c58..657eac831cf0650ce3c4ac6a1f6a690b282cea59 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.7.0.3/git.html[documentation for release 1.7.0.3]
+* link:v1.7.0.4/git.html[documentation for release 1.7.0.4]

 
 * release notes for
 
 * release notes for

+  link:RelNotes-1.7.0.4.txt[1.7.0.4],

   link:RelNotes-1.7.0.3.txt[1.7.0.3],
   link:RelNotes-1.7.0.2.txt[1.7.0.2],
   link:RelNotes-1.7.0.1.txt[1.7.0.1],
   link:RelNotes-1.7.0.3.txt[1.7.0.3],
   link:RelNotes-1.7.0.2.txt[1.7.0.2],
   link:RelNotes-1.7.0.1.txt[1.7.0.1],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 076c18ecc3fc9dc77d1be5dc6e960da72c519576..3eb6d8517eeda1e51d042363f0265fc87f4e5ba0 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.0.3
+DEF_VER=v1.7.0.4

 
 LF='
 '
 
 LF='
 '