git, branch v2.8.1Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v2.8.12016-04-03T17:14:12ZGit 2.8.12016-04-03T17:14:12ZJunio C Hamanogitster@pobox.com2016-04-03T17:11:35Zurn:sha1:d95553a6b8c5153f541adcfc3346004e8249b0e6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mm/readme-markdown' into maint2016-04-03T17:13:09ZJunio C Hamanogitster@pobox.com2016-04-03T17:13:09Zurn:sha1:6e4de7fca317133746a62de308ab16afb1204487
* 'mm/readme-markdown':
git.spec.in: use README.md, not README
git.spec.in: use README.md, not README2016-04-03T17:12:48ZMatthieu MoyMatthieu.Moy@imag.fr2016-04-01T07:10:51Zurn:sha1:c7089e0ee9e65d53681d17d31322f6cee2e55e1f
The file was renamed in 4ad21f5 (README: use markdown syntax,
2016-02-25), but that commit forgot to update git.spec.in, which
caused the rpmbuild target in the Makefile to fail.
Reported-by: Ron Isaacson <isaacson.ljits@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.82016-03-28T19:19:45ZJunio C Hamanogitster@pobox.com2016-03-28T19:19:45Zurn:sha1:90f7b16b3adc78d4bbabbd426fb69aa78c714f71
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ls/p4-doc-markup'2016-03-24T19:28:06ZJunio C Hamanogitster@pobox.com2016-03-24T19:28:06Zurn:sha1:56331f8727b0c2e7dc713b728eaf1e5843422cb7
* ls/p4-doc-markup:
Documentation: fix git-p4 AsciiDoc formatting
Documentation: use ASCII quotation marks in git-p4
Merge branch 'js/mingw-tests-2.8'2016-03-24T19:27:58ZJunio C Hamanogitster@pobox.com2016-03-24T19:27:58Zurn:sha1:269fe3aed490b24f2b5d2d69ac2cc508e9366ac6
* js/mingw-tests-2.8:
mingw: skip some tests in t9115 due to file name issues
t1300: fix the new --show-origin tests on Windows
t1300-repo-config: make it resilient to being run via 'sh -x'
config --show-origin: report paths with forward slashes
Merge branch 'sb/submodule-module-list-pathspec-fix'2016-03-24T19:27:13ZJunio C Hamanogitster@pobox.com2016-03-24T19:27:12Zurn:sha1:2a4c8c36a7f6ad3520c0702f31dc7cff5176f1be
A fix for a small regression in "module_list" helper that was
rewritten in C (also applies to 2.7.x).
* sb/submodule-module-list-pathspec-fix:
submodule: fix regression for deinit without submodules
Merge branch 'master' of git://github.com/git-l10n/git-po2016-03-23T19:22:42ZJunio C Hamanogitster@pobox.com2016-03-23T19:22:42Zurn:sha1:7e4ba3686ab04b2fdcb80f52e8784c9bebdb0401
* 'master' of git://github.com/git-l10n/git-po:
l10n: pt_PT: Update and add new translations
l10n: ca.po: update translation
l10n: vi.po (2530t): Update translation
Documentation: fix git-p4 AsciiDoc formatting2016-03-23T17:09:11ZLars Schneiderlarsxschneider@gmail.com2016-03-23T10:59:01Zurn:sha1:887523ebb8cedcb2f219a18539b2be98e6a5e7cd
Noticed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mingw: skip some tests in t9115 due to file name issues2016-03-23T17:03:37ZJohannes Schindelinjohannes.schindelin@gmx.de2016-03-23T10:55:20Zurn:sha1:8257d3b458f0b64516f4aee66a9b2b2df30744e1
These two tests wanted to write file names which are incompatible with
Windows' file naming rules (even if they pass using Cygwin due to
Cygwin's magic path mangling).
While at it, skip the same tests also on MacOSX/HFS, as pointed out by
Torsten Bögershausen.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>