Skip to content

Commit

Permalink
GIT 1.5.4.4
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Mar 9, 2008
1 parent 6c293d4 commit 56d5fe2
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
32 changes: 26 additions & 6 deletions Documentation/RelNotes-1.5.4.4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
O=v1.5.4.3-32-g0f2d447
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.
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v1.5.4.3.GIT
DEF_VER=v1.5.4.4.GIT

LF='
'
Expand Down

0 comments on commit 56d5fe2

Please sign in to comment.