Sixth batch for the 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 10, 2016 at 14:24 UTC
494398473714dcbedb38b1ac79b531c7384b3bc4
1 file changed
+40
Documentation/RelNotes/2.8.0.txt
+40
@@ -67,6 +67,22 @@ UI, Workflows & Features
67
has been taught to use credential API to store the authentication
68
material in user's keyrings.
69
70
+ * Update the untracked cache subsystem and change its primary UI from
71
+ "git update-index" to "git config".
72
+
73
+ * There were a few "now I am doing this thing" progress messages in
74
+ the TCP connection code that can be triggered by setting a verbose
75
+ option internally in the code, but "git fetch -v" and friends never
76
+ passed the verbose option down to that codepath.
77
+
78
+ * Clean/smudge filters defined in a configuration file of lower
79
+ precedence can now be overridden to be a pass-through no-op by
80
+ setting the variable to an empty string.
81
+
82
+ * A new "<branch>^{/!-<pattern>}" notation can be used to name a
83
+ commit that is reachable from <branch> that does not match the
84
+ given <pattern>.
85
+
86
87
Performance, Internal Implementation, Development Support etc.
88
@@ -227,6 +243,30 @@ notes for details).
243
CPU cycles.
244
(merge a2d5156 jk/ref-cache-non-repository-optim later to maint).
245
246
+ * "git worktree" had a broken code that attempted to auto-fix
247
+ possible inconsistency that results from end-users moving a
248
+ worktree to different places without telling Git (the original
249
+ repository needs to maintain backpointers to its worktrees, but
250
+ "mv" run by end-users who are not familiar with that fact will
251
+ obviously not adjust them), which actually made things worse
252
+ when triggered.
253
+ (merge 618244e nd/do-not-move-worktree-manually later to maint).
254
+
255
+ * The low-level merge machinery has been taught to use CRLF line
256
+ termination when inserting conflict markers to merged contents that
257
+ are themselves CRLF line-terminated.
258
+ (merge 15980de js/xmerge-marker-eol later to maint).
259
+
260
+ * "git push --force-with-lease" has been taught to report if the push
261
+ needed to force (or fast-forwarded).
262
+ (merge b2e93f8 aw/push-force-with-lease-reporting later to maint).
263
+
264
+ * The emulated "yes" command used in our test scripts has been
265
+ tweaked not to spend too much time generating unnecessary output
266
+ that is not used, to help those who test on Windows where it would
267
+ not stop until it fills the pipe buffer due to lack of SIGPIPE.
268
+ (merge 6129c93 js/test-lib-windows-emulated-yes later to maint).
269
+
270
* Other minor clean-ups and documentation updates
271
(merge 99487cf ss/user-manual later to maint).
272
(merge e914ef0 ew/for-each-ref-doc later to maint).