Sixth batch for the 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2016-02-10 14:24:14 -08:00
parent 4ecc59aa42
commit 4943984737

View File

@ -67,6 +67,22 @@ UI, Workflows & Features
has been taught to use credential API to store the authentication
material in user's keyrings.
* Update the untracked cache subsystem and change its primary UI from
"git update-index" to "git config".
* There were a few "now I am doing this thing" progress messages in
the TCP connection code that can be triggered by setting a verbose
option internally in the code, but "git fetch -v" and friends never
passed the verbose option down to that codepath.
* Clean/smudge filters defined in a configuration file of lower
precedence can now be overridden to be a pass-through no-op by
setting the variable to an empty string.
* A new "<branch>^{/!-<pattern>}" notation can be used to name a
commit that is reachable from <branch> that does not match the
given <pattern>.
Performance, Internal Implementation, Development Support etc.
@ -227,6 +243,30 @@ notes for details).
CPU cycles.
(merge a2d5156 jk/ref-cache-non-repository-optim later to maint).
* "git worktree" had a broken code that attempted to auto-fix
possible inconsistency that results from end-users moving a
worktree to different places without telling Git (the original
repository needs to maintain backpointers to its worktrees, but
"mv" run by end-users who are not familiar with that fact will
obviously not adjust them), which actually made things worse
when triggered.
(merge 618244e nd/do-not-move-worktree-manually later to maint).
* The low-level merge machinery has been taught to use CRLF line
termination when inserting conflict markers to merged contents that
are themselves CRLF line-terminated.
(merge 15980de js/xmerge-marker-eol later to maint).
* "git push --force-with-lease" has been taught to report if the push
needed to force (or fast-forwarded).
(merge b2e93f8 aw/push-force-with-lease-reporting later to maint).
* The emulated "yes" command used in our test scripts has been
tweaked not to spend too much time generating unnecessary output
that is not used, to help those who test on Windows where it would
not stop until it fills the pipe buffer due to lack of SIGPIPE.
(merge 6129c93 js/test-lib-windows-emulated-yes later to maint).
* Other minor clean-ups and documentation updates
(merge 99487cf ss/user-manual later to maint).
(merge e914ef0 ew/for-each-ref-doc later to maint).