diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:12:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 13:12:56 -0800 |
commit | 326e5bc91eecf73234ead29636207bc516573e79 (patch) | |
tree | 802b6758c0c27ae910f40e1b4862cb72a71eee9f | |
parent | Merge branch 'nd/ita-cleanup' into maint (diff) | |
download | tgif-326e5bc91eecf73234ead29636207bc516573e79.tar.xz |
Git 2.7.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/RelNotes/2.7.2.txt | 14 | ||||
-rw-r--r-- | Documentation/git.txt | 3 | ||||
-rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.7.2.txt b/Documentation/RelNotes/2.7.2.txt index f7846a2569..4feef76704 100644 --- a/Documentation/RelNotes/2.7.2.txt +++ b/Documentation/RelNotes/2.7.2.txt @@ -24,4 +24,18 @@ Fixes since v2.7.1 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. diff --git a/Documentation/git.txt b/Documentation/git.txt index d987ad20c9..68a71b46c9 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.7.1/git.html[documentation for release 2.7.1] +* link:v2.7.2/git.html[documentation for release 2.7.2] * release notes for + link:RelNotes/2.7.2.txt[2.7.2], link:RelNotes/2.7.1.txt[2.7.1], link:RelNotes/2.7.0.txt[2.7]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 330b339d1c..d7ab24e356 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.7.1 +DEF_VER=v2.7.2 LF=' ' |