Skip to content

Commit b0576a6

Browse files
committed
Update draft release notes to 1.8.0
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3d7535e commit b0576a6

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

Documentation/RelNotes/1.8.0.txt

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ UI, Workflows & Features
4545
* "git cherry-pick" learned the "--allow-empty-message" option to
4646
allow it to replay a commit without any log message.
4747

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+
4853
* "git daemon" learned the "--access-hook" option to allow an
4954
external command to decline service based on the client address,
5055
repository path, etc.
@@ -66,6 +71,9 @@ Foreign Interface
6671

6772
* "git svn" has been updated to work with SVN 1.7.
6873

74+
* "git p4" learned "--conflicts" option to specify what to do when
75+
encountering a conflict during "p4 submit".
76+
6977

7078
Performance, Internal Implementation, etc. (please report possible regressions)
7179

@@ -134,10 +142,16 @@ to them for details).
134142
(merge 52ffe99 jw/doc-commit-title later to maint).
135143

136144
* 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
138147
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).
141155

142156
* Earlier we made the diffstat summary line that shows the number of
143157
lines added/deleted localizable, but it was found irritating having

0 commit comments

Comments
 (0)