git/Documentation, branch v2.9.0Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.9.02016-06-13T17:42:13ZGit 2.92016-06-13T17:42:13ZJunio C Hamanogitster@pobox.com2016-06-13T17:42:13Zurn:sha1:05219a1276341e72d8082d76b7f5ed394b7437a4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Hopefully the final last-minute update before 2.9 final2016-06-10T22:30:19ZJunio C Hamanogitster@pobox.com2016-06-10T22:30:19Zurn:sha1:a28705da929ad746abcb34270947f738549d3246
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jk/diff-compact-heuristic'2016-06-10T22:26:06ZJunio C Hamanogitster@pobox.com2016-06-10T22:26:06Zurn:sha1:e5f767554404592cf65e7c49b3594b195a324031
It turns out that the earlier effort to update the heuristics may
want to use a bit more time to mature. Turn it off by default.
* jk/diff-compact-heuristic:
diff: disable compaction heuristic for now
diff: disable compaction heuristic for now2016-06-10T20:45:23ZJunio C Hamanogitster@pobox.com2016-06-10T17:58:55Zurn:sha1:5580b271af518bae30148edfd42cc8459d8da384
http://lkml.kernel.org/g/20160610075043.GA13411@sigill.intra.peff.net
reports that a change to add a new "function" with common ending
with the existing one at the end of the file is shown like this:
def foo
do_foo_stuff()
+ common_ending()
+end
+
+def bar
+ do_bar_stuff()
+
common_ending()
end
when the new heuristic is in use. In reality, the change is to add
the blank line before "def bar" and everything below, which is what
the code without the new heuristic shows.
Disable the heuristics by default, and resurrect the documentation
for the option and the configuration variables, while clearly
marking the feature as still experimental.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.9-rc22016-06-06T21:34:52ZJunio C Hamanogitster@pobox.com2016-06-06T21:19:45Zurn:sha1:49fa3dc76179e04b0833542fa52d0f287a4955ac
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 2.8.42016-06-06T21:30:49ZJunio C Hamanogitster@pobox.com2016-06-06T21:30:49Zurn:sha1:c42b5d8e69ba45b00d1681745a72c1d3af1e897f
* maint:
Git 2.8.4
Git 2.8.42016-06-06T21:29:32ZJunio C Hamanogitster@pobox.com2016-06-06T21:29:32Zurn:sha1:0b65a8dbdb38962e700ee16776a3042beb489060
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tb/core-eol-fix' into maint2016-06-06T21:27:36ZJunio C Hamanogitster@pobox.com2016-06-06T21:27:36Zurn:sha1:7dcbf891d975eba5b1e3095cb3b389834689ac09
A couple of bugs around core.autocrlf have been fixed.
* tb/core-eol-fix:
convert.c: ident + core.autocrlf didn't work
t0027: test cases for combined attributes
convert: allow core.autocrlf=input and core.eol=crlf
t0027: make commit_chk_wrnNNO() reliable
Almost ready for 2.9-rc22016-06-03T21:38:35ZJunio C Hamanogitster@pobox.com2016-06-03T21:38:35Zurn:sha1:6326f199252a1a5fbdea105473f8305d850cdd87
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'em/man-bold-literal'2016-06-03T21:38:02ZJunio C Hamanogitster@pobox.com2016-06-03T21:38:02Zurn:sha1:a8398b952d9d0cb43e0c41431b8326b65fd631fd
The manpage output of our documentation did not render well in
terminal; typeset literals in bold by default to make them stand
out more.
* em/man-bold-literal:
Documentation: bold literals in man