diff options
| author | adam <adam@pkgsrc.org> | 2016-02-29 10:50:55 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2016-02-29 10:50:55 +0000 |
| commit | 987f06801fa578f1d8d26151826b347522b90a42 (patch) | |
| tree | a689beb89dd857587a1e22f073f1d7bac0dfacaa /devel/git | |
| parent | 48e72326e1fdf35d03809fea8cb9e372a0315b08 (diff) | |
| download | pkgsrc-987f06801fa578f1d8d26151826b347522b90a42.tar.gz | |
Changes 2.7.2:
* 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.
Diffstat (limited to 'devel/git')
| -rw-r--r-- | devel/git/Makefile.version | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index 9046bbd541b..74d2a0b0e21 100644 --- a/devel/git/Makefile.version +++ b/devel/git/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.37 2016/02/07 10:27:23 adam Exp $ +# $NetBSD: Makefile.version,v 1.38 2016/02/29 10:50:55 adam Exp $ # # used by devel/git/Makefile.common # used by devel/git-svn/Makefile -GIT_VERSION= 2.7.1 +GIT_VERSION= 2.7.2 |