summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4cb51a6)
raw | patch | inline | side by side (parent: 4cb51a6)
author | Junio C Hamano <gitster@pobox.com> | |
Fri, 11 Dec 2009 00:22:42 +0000 (16:22 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 11 Dec 2009 00:22:42 +0000 (16:22 -0800) |
These three have already been backported to 1.6.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes-1.6.6.txt | patch | blob | history |
index 8f9d4f5a4e9b4d80023dd91744e06924fe799146..059e9c3c14067777069e06a1883167d3dd35d108 100644 (file)
All of the fixes in v1.6.5.X maintenance series are included in this
release, unless otherwise noted.
- * Enumeration of available merge strategies iterated over the list of
- commands in a wrong way, sometimes producing an incorrect result.
- Will backport by merging ed87465 (builtin-merge.c: call
- exclude_cmds() correctly., 2009-11-25).
-
- * "git format-patch revisions... -- path" issued an incorrect error
- message that suggested to use "--" on the command line when path
- does not exist in the current work tree (it is a separate matter if
- it makes sense to limit format-patch with pathspecs like that
- without using the --full-diff option). Will backport by merging
- 7e93d3b (format-patch: add test for parsing of "--", 2009-11-26).
-
- * "git shortlog" did not honor the "encoding" header embedded in the
- commit object like "git log" did. Will backport by merging 79f7ca0
- (shortlog: respect commit encoding, 2009-11-25).
-
---
exec >/var/tmp/1
echo O=$(git describe master)