Update draft release notes to 1.8.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 18, 2012 at 14:43 UTC
b0576a6a6dd3b311391090b2ce15f991ac9914cf
1 file changed
+17
-3
Documentation/RelNotes/1.8.0.txt
+17
-3
@@ -45,6 +45,11 @@ UI, Workflows & Features
45
* "git cherry-pick" learned the "--allow-empty-message" option to
46
allow it to replay a commit without any log message.
47
48
+ * After "git cherry-pick -s" gave control back to the user asking
49
+ help to resolve conflicts, concluding "git commit" used to need to
50
+ be run with "-s" if the user wants to sign it off; now the command
51
+ leaves the sign-off line in the log template.
52
+
53
* "git daemon" learned the "--access-hook" option to allow an
54
external command to decline service based on the client address,
55
repository path, etc.
@@ -66,6 +71,9 @@ Foreign Interface
71
72
* "git svn" has been updated to work with SVN 1.7.
73
74
+ * "git p4" learned "--conflicts" option to specify what to do when
75
+ encountering a conflict during "p4 submit".
76
+
77
78
Performance, Internal Implementation, etc. (please report possible regressions)
79
@@ -134,10 +142,16 @@ to them for details).
142
(merge 52ffe99 jw/doc-commit-title later to maint).
143
144
* The attribute system may be asked for a path that itself or its
137
- leading directories no longer exists in the working tree. Failure
145
+ leading directories no longer exists in the working tree, and it is
146
+ fine if we cannot open .gitattribute file in such a case. Failure
147
to open per-directory .gitattributes with error status other than
139
- ENOENT and ENOTDIR are diagnosed.
140
- (merge 8e950da jk/config-warn-on-inaccessible-paths later to maint).
148
+ ENOENT and ENOTDIR should be diagnosed, but it wasn't.
149
+
150
+ * "git log --all-match --grep=A --grep=B" ought to show commits that
151
+ mention both A and B, but when these three options are used with
152
+ --author or --committer, it showed commits that mention either A or
153
+ B (or both) instead.
154
+ (merge 39f2e01 jc/maint-log-grep-all-match later to maint).
155
156
* Earlier we made the diffstat summary line that shows the number of
157
lines added/deleted localizable, but it was found irritating having