Ninth batch for 2.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 30, 2015 at 13:17 UTC
2635c2b8bfc9aec07b7f023d8e3b3d02df715344
1 file changed
+31
-2
Documentation/RelNotes/2.7.0.txt
+31
-2
@@ -55,6 +55,9 @@ UI, Workflows & Features
55
56
* "git worktree" learned a "list" subcommand.
57
58
+ * "git clone --dissociate" learned that it can be used even when
59
+ "--reference" was not used at the same time.
60
+
61
62
Performance, Internal Implementation, Development Support etc.
63
@@ -179,8 +182,11 @@ notes for details).
182
183
* "git rebase -i" had a minor regression recently, which stopped
184
considering a line that begins with an indented '#' in its insn
182
- sheet not a comment, which is now fixed.
183
- (merge 1db168e gr/rebase-i-drop-warn later to maint).
185
+ sheet not a comment. Further, the code was still too picky on
186
+ Windows where CRLF left by the editor is turned into a trailing CR
187
+ on the line read via the "read" built-in command of bash. Both of
188
+ these issues are now fixed.
189
+ (merge 39743cf gr/rebase-i-drop-warn later to maint).
190
191
* After "git checkout --detach", "git status" reported a fairly
192
useless "HEAD detached at HEAD", instead of saying at which exact
@@ -278,6 +284,26 @@ notes for details).
284
borrowing cache entries and restructuring the API somewhat.
285
(merge 41284eb dt/name-hash-dir-entry-fix later to maint).
286
287
+ * "git merge-file" tried to signal how many conflicts it found, which
288
+ obviously would not work well when there are too many of them.
289
+ (merge e34f802 jk/merge-file-exit-code later to maint).
290
+
291
+ * The error message from "git blame --contents --reverse" incorrectly
292
+ talked about "--contents --children".
293
+ (merge 9526197 mk/blame-error-message later to maint).
294
+
295
+ * "git imap-send" did not compile well with older version of cURL library.
296
+ (merge 71d9257 js/imap-send-curl-compilation-fix later to maint).
297
+
298
+ * Merging a branch that removes a path and another that changes the
299
+ mode bits on the same path should have conflicted at the path, but
300
+ it didn't and silently favoured the removal.
301
+ (merge 72fac66 jk/delete-modechange-conflict later to maint).
302
+
303
+ * "git --literal-pathspecs add -u/-A" without any command line
304
+ argument misbehaved ever since Git 2.0.
305
+ (merge 29abb33 jc/add-u-A-default-to-top later to maint).
306
+
307
* Code clean-up, minor fixes etc.
308
(merge 15ed07d jc/rerere later to maint).
309
(merge e7a7401 pt/pull-builtin later to maint).
@@ -292,3 +318,6 @@ notes for details).
318
(merge 3b19dba jc/em-dash-in-doc later to maint).
319
(merge f3f38c7 jc/everyday-markup later to maint).
320
(merge 77d5f71 xf/user-manual-markup later to maint).
321
+ (merge b2af482 xf/user-manual-ff later to maint).
322
+ (merge e510ab8 rs/pop-commit later to maint).
323
+ (merge fdcdb77 js/misc-fixes later to maint).