path: root/Documentation
diff options
authorJunio C Hamano <>2008-03-09 04:07:49 (GMT)
committerJunio C Hamano <>2008-03-09 04:07:57 (GMT)
commitad416ed433fdcf838916a84177fe9e810be19eff (patch)
treedcba56533726b1e791b4c9ab8f44c7f8fd4a1b2e /Documentation
parentcaa99829a24bc4decf86278c3478c88f564a795a (diff)
parent56d5fe285583b5177ffc65dbe7df636ed5b8cc6b (diff)
Merge branch 'maint' to sync with
* maint: GIT ident.c: reword error message when the user name cannot be determined Fix dcommit, rebase when rewriteRoot is in use Really make the LF after reset in fast-import optional
Diffstat (limited to 'Documentation')
3 files changed, 28 insertions, 11 deletions
diff --git a/Documentation/RelNotes- b/Documentation/RelNotes-
index 5635977..89fa6d0 100644
--- a/Documentation/RelNotes-
+++ b/Documentation/RelNotes-
@@ -37,10 +37,30 @@ Fixes since v1.5.4.3
* "git revert" did not properly fail when attempting to run with a
dirty index.
-Also included are a handful documentation updates.
+ * "git merge --no-commit --no-ff <other>" incorrectly made commits.
+ * "git merge --squash --no-ff <other>", which is a nonsense combination
+ of options, was not rejected.
+ * "git ls-remote" and "git remote show" against an empty repository
+ failed, instead of just giving an empty result (regression).
+ * "git fast-import" did not handle a renamed path whose name needs to be
+ quoted, due to a bug in unquote_c_style() function.
+ * "git cvsexportcommit" was confused when multiple files with the same
+ basename needed to be pushed out in the same commit.
+ * "git daemon" did not send early errors to syslog.
-exec >/var/tmp/1
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
+ * "git log --merge" did not work well with --left-right option.
+ * "git svn" promprted for client cert password every time it accessed the
+ server.
+ * The reset command in "git fast-import" data stream was documented to
+ end with an optional LF, but it actually required one.
+ * "git svn dcommit/rebase" did not honor --rewrite-root option.
+Also included are a handful documentation updates.
diff --git a/Documentation/RelNotes-1.5.5.txt b/Documentation/RelNotes-1.5.5.txt
index b57fa1e..874dad9 100644
--- a/Documentation/RelNotes-1.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.txt
@@ -160,13 +160,9 @@ Fixes since v1.5.4
All of the fixes in v1.5.4 maintenance series are included in
this release, unless otherwise noted.
- * "git-daemon" did not send early errors to syslog.
* "git-http-push" did not allow deletion of remote ref with the usual
"push <remote> :<branch>" syntax.
- * "git-log --merge" did not well work with --left-right option.
* "git-rebase --abort" did not go back to the right location if
"git-reset" was run during the "git-rebase" session.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 741ae0e..3ed24d4 100644
--- 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:
-* link:v1.5.4.3/git.html[documentation for release]
+* link:v1.5.4.4/git.html[documentation for release]
* release notes for
+ link:RelNotes-[],