GIT 1.5.4

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

diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt
index f968fc4957e05287f572ee7c3e66b92d8c70c3c0..f1323b61746ee5d7f2a9d2fc3835c2cd75e76434 100644 (file)
--- a/Documentation/RelNotes-1.5.4.txt
+++ b/Documentation/RelNotes-1.5.4.txt
@@ -35,7 +35,7 @@ Deprecation notices
    - Using dashed forms of git commands (e.g. "git-commit") from the
      command line has been informally deprecated since early 2006, but
      now it officially is, and will be removed in the future.  Use
    - Using dashed forms of git commands (e.g. "git-commit") from the
      command line has been informally deprecated since early 2006, but
      now it officially is, and will be removed in the future.  Use

-     dashless forms (e.g. "git commit") instead.
+     dash-less forms (e.g. "git commit") instead.

 
    - Using dashed forms from your scripts, without first prepending the
      return value from "git --exec-path" to the scripts' PATH, has been
 
    - Using dashed forms from your scripts, without first prepending the
      return value from "git --exec-path" to the scripts' PATH, has been


@@ -166,7 +166,7 @@ Updates since v1.5.3
    command line in the generated log message, when told to cherry-pick a
    commit by naming a tag that points at it.  It does not anymore.
 
    command line in the generated log message, when told to cherry-pick a
    commit by naming a tag that points at it.  It does not anymore.
 

- * "git for-each-ref" learned %(xxxdate:<dateformat>) syntax to show the
+ * "git for-each-ref" learned %(xxxdate:<date-format>) syntax to show the

    various date fields in different formats.
 
  * "git gc --auto" is a low-impact way to automatically run a variant of
    various date fields in different formats.
 
  * "git gc --auto" is a low-impact way to automatically run a variant of


@@ -221,7 +221,7 @@ Updates since v1.5.3
  * "git pull --rebase" is a different way to integrate what you fetched
    into your current branch.
 
  * "git pull --rebase" is a different way to integrate what you fetched
    into your current branch.
 

- * "git fast-export" produces datastream that can be fed to fast-import
+ * "git fast-export" produces data-stream that can be fed to fast-import

    to reproduce the history recorded in a git repository.
 
  * "git add -i" takes pathspecs to limit the set of files to work on.
    to reproduce the history recorded in a git repository.
 
  * "git add -i" takes pathspecs to limit the set of files to work on.


@@ -342,7 +342,7 @@ Updates since v1.5.3
 
  * "git help" learned "-w" option to show documentation in browsers.
 
 
  * "git help" learned "-w" option to show documentation in browsers.
 

- * In addition there are quite a few internal clean-ups. Notably
+ * In addition there are quite a few internal clean-ups. Notably:

 
    - many fork/exec have been replaced with run-command API,
      brought from the msysgit effort.
 
    - many fork/exec have been replaced with run-command API,
      brought from the msysgit effort.


@@ -365,7 +365,7 @@ series.
  * The way "git diff --check" behaves is much more consistent with the way
    "git apply --whitespace=warn" works.
 
  * The way "git diff --check" behaves is much more consistent with the way
    "git apply --whitespace=warn" works.
 

- * "git svn" talking with the SVN over http will correctly quote branch
+ * "git svn" talking with the SVN over HTTP will correctly quote branch

    and project names.
 
  * "git config" did not work correctly on platforms that define
    and project names.
 
  * "git config" did not work correctly on platforms that define


@@ -375,9 +375,3 @@ series.
    documentation; a workaround has been implemented.
 
  * "git diff --color-words" colored context lines in a wrong color.
    documentation; a workaround has been implemented.
 
  * "git diff --color-words" colored context lines in a wrong color.

-
---
-exec >/var/tmp/1
-O=v1.5.4-rc5
-echo O=`git describe refs/heads/master`
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e0842c462c25052552060749dca0e2143031004d..38a3273974e3313550218cdb8b50f3f2a8b4dec6 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.5.4-rc5.GIT
+DEF_VER=v1.5.4.GIT

 
 LF='
 '
 
 LF='
 '