[thirdparty/git.git] / Documentation / RelNotes / 2.7.2.txt

Git v2.7.2 Release Notes
========================

Fixes since v2.7.1
------------------

 * 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.

 * "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.

 * "git push --force-with-lease" has been taught to report if the push
   needed to force (or fast-forwarded).

 * 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.

 * The vimdiff backend for "git mergetool" has been tweaked to arrange
   and number buffers in the order that would match the expectation of
   majority of people who read left to right, then top down and assign
   buffers 1 2 3 4 "mentally" to local base remote merge windows based
   on that order.

 * The documentation for "git clean" has been corrected; it mentioned
   that .git/modules/* are removed by giving two "-f", which has never
   been the case.

 * Paths that have been told the index about with "add -N" are not
   quite yet in the index, but a few commands behaved as if they
   already are in a harmful way.

Also includes tiny documentation and test updates.
Commit	Line	Data
8a71d90b JH	1	Git v2.7.2 Release Notes
	2	========================
	3
	4	Fixes since v2.7.1
	5	------------------
	6
	7	* The low-level merge machinery has been taught to use CRLF line
	8	termination when inserting conflict markers to merged contents that
	9	are themselves CRLF line-terminated.
	10
	11	* "git worktree" had a broken code that attempted to auto-fix
	12	possible inconsistency that results from end-users moving a
	13	worktree to different places without telling Git (the original
	14	repository needs to maintain backpointers to its worktrees, but
	15	"mv" run by end-users who are not familiar with that fact will
	16	obviously not adjust them), which actually made things worse
	17	when triggered.
	18
	19	* "git push --force-with-lease" has been taught to report if the push
	20	needed to force (or fast-forwarded).
	21
	22	* The emulated "yes" command used in our test scripts has been
	23	tweaked not to spend too much time generating unnecessary output
	24	that is not used, to help those who test on Windows where it would
	25	not stop until it fills the pipe buffer due to lack of SIGPIPE.
	26
326e5bc9 JH	27	* The vimdiff backend for "git mergetool" has been tweaked to arrange
	28	and number buffers in the order that would match the expectation of
	29	majority of people who read left to right, then top down and assign
	30	buffers 1 2 3 4 "mentally" to local base remote merge windows based
	31	on that order.
	32
	33	* The documentation for "git clean" has been corrected; it mentioned
	34	that .git/modules/* are removed by giving two "-f", which has never
	35	been the case.
	36
	37	* Paths that have been told the index about with "add -N" are not
	38	quite yet in the index, but a few commands behaved as if they
	39	already are in a harmful way.
	40
8a71d90b	41	Also includes tiny documentation and test updates.