From 0e66113fe921f700076faeb79fb355329fe9484c Mon Sep 17 00:00:00 2001
From: Junio C Hamano
Date: Mon, 21 Jan 2008 02:37:44 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.4-rc4
---
RelNotes-1.5.4.txt | 7 ++++++-
git-cherry-pick.html | 4 ++--
git-cherry-pick.txt | 2 +-
git-revert.html | 4 ++--
git-revert.txt | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt
index 97a9bd9cd..9c864c9de 100644
--- a/RelNotes-1.5.4.txt
+++ b/RelNotes-1.5.4.txt
@@ -10,6 +10,9 @@ Removal
* As git-commit and git-status have been rewritten, "git runstatus"
helper script lost all its users and has been removed.
+ * Curl library older than 7.10 is not supported by "git http-push",
+ as it does not work without CURLM.
+
Deprecation notices
-------------------
@@ -360,8 +363,10 @@ series.
* Recent versions of AsciiDoc 8 has a change to break our
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-rc3
+O=v1.5.4-rc4
echo O=`git describe refs/heads/master`
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index a2a407f4f..e82deb9d6 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -299,7 +299,7 @@ modifications from the HEAD commit).
With this option, git-cherry-pick will let you edit the commit
- message prior committing.
+ message prior to committing.
@@ -375,7 +375,7 @@ effect to your working tree in a row.