delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Git 2.3v2.3.0	Junio C Hamano	2015-02-05	3	-1/+12
\| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Merge git://github.com/git-l10n/git-po	Junio C Hamano	2015-02-02	1	-5/+5
\|\ \| \| \| \| \| \| \| \|	* git://github.com/git-l10n/git-po: l10n: ca.po: Fix trailing whitespace
\| *	l10n: ca.po: Fix trailing whitespace	Alex Henrie	2015-01-30	1	-5/+5
\|/ \| \| \|	Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
*	Git 2.3.0-rc2v2.3.0-rc2	Junio C Hamano	2015-01-27	1	-1/+1
\| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Merge git://github.com/git-l10n/git-po	Junio C Hamano	2015-01-27	2	-929/+941
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* git://github.com/git-l10n/git-po: l10n: de.po: correct singular form l10n: de.po: translate "leave behind" correctly l10n: de.po: fix typo l10n: ca.po: update translation
\| *	Merge branch 'master' of git://github.com/alexhenrie/git-po	Jiang Xin	2015-01-27	1	-925/+937
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation
\| \| *	l10n: ca.po: update translation	Alex Henrie	2015-01-26	1	-925/+937
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
\| * \|	l10n: de.po: correct singular form	Michael J Gruber	2015-01-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| * \|	l10n: de.po: translate "leave behind" correctly	Michael J Gruber	2015-01-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This message is about leaving orphaned commits behind, not about behind an upstream branch. Try to make this clear. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| * \|	l10n: de.po: fix typo	Benedikt Heine	2015-01-26	1	-2/+2
\| \|/ \| \| \| \| \| \| \| \|	Signed-off-by: Benedikt Heine <bebe@bebehei.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
* \|	Merge branch 'js/t1050'	Junio C Hamano	2015-01-22	1	-6/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	* js/t1050: t1050-large: generate large files without dd
\| * \|	t1050-large: generate large files without ddjs/t1050	Johannes Sixt	2015-01-14	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For some unknown reason, the dd on my Windows box segfaults randomly, but since recently, it does so much more often than it used to, which makes running the test suite burdensome. Use printf to write large files instead of dd. To emphasize that three of the large blobs are exact copies, use cp to allocate them. The new code makes the files a bit smaller, and they are not sparse anymore, but the tests do not depend on these properties. We do not want to use test-genrandom here (which is used to generate large files elsewhere in t1050), so that the files can be compressed well (which keeps the run-time short). The files are now large text files, not binary files. But since they are larger than core.bigfilethreshold they are diagnosed as binary by Git. For this reason, the 'git diff' tests that check the output for "Binary files differ" still pass. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \|	Merge branch 'ak/cat-file-clean-up'	Junio C Hamano	2015-01-22	1	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* ak/cat-file-clean-up: cat-file: use "type" and "size" from outer scope
\| * \| \|	cat-file: use "type" and "size" from outer scopeak/cat-file-clean-up	Alexander Kuleshov	2015-01-13	1	-2/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In cat_one_file(), "type" and "size" variables are defined in the function scope, and then two variables of the same name are defined in a block in one of the if/else statement, hiding the definitions in the outer scope. Because the values of the outer variables before the control enters this scope, however, do not have to be preserved, we can remove useless definitions of variables from the inner scope safely without breaking anything. Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \|	Merge git://github.com/git-l10n/git-po	Junio C Hamano	2015-01-22	7	-6423/+6506
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* git://github.com/git-l10n/git-po: l10n: correct indentation of show-branch usage l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
\| * \|	l10n: correct indentation of show-branch usage	Jiang Xin	2015-01-21	6	-64/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	An indentation error was found right after we started l10n round 2, and commit d6589d1 (show-branch: fix indentation of usage string) and this update would fix it. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| * \|	Merge branch 'master' of git://github.com/git-l10n/git-po	Jiang Xin	2015-01-21	7	-6430/+6515
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
\| \| * \|	l10n: de.po: translate 3 messages	Ralf Thielow	2015-01-20	1	-141/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| \| * \|	l10n: zh_CN: various fixes on command arguments	Jiang Xin	2015-01-19	1	-176/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated translations for Git 2.3.0 l10n round 2, and fixed various translations for command arguments. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| \| * \|	Merge branch 'v2.3.0' of git://github.com/jnavila/git	Jiang Xin	2015-01-19	1	-133/+137
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'v2.3.0' of git://github.com/jnavila/git: l10n: fr.po v2.3.0 round 2
\| \| \| * \|	l10n: fr.po v2.3.0 round 2	Jean-Noel Avila	2015-01-18	1	-133/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
\| \| * \| \|	Merge branch 'master' of git://github.com/nafmo/git-l10n-sv	Jiang Xin	2015-01-19	1	-131/+131
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2298t0f0u)
\| \| \| * \| \|	l10n: sv.po: Update Swedish translation (2298t0f0u)	Peter Krefting	2015-01-18	1	-131/+131
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| \| * \| \|	l10n: vi.po(2298t): Updated 3 new strings	Tran Ngoc Quan	2015-01-19	1	-137/+137
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| \| * \|	l10n: git.pot: v2.3.0 round 2 (3 updated)	Jiang Xin	2015-01-18	1	-124/+124
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from v2.3.0-rc0-44-ga94655d for git v2.3.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| \| * \|	Merge branch 'master' of git://github.com/git-l10n/git-po	Jiang Xin	2015-01-18	7	-6003/+6084
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
\| \| \| * \|	l10n: de.po: translate 13 new messages	Ralf Thielow	2015-01-17	1	-836/+857
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 13 new messages came from git.pot update in beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| \| \| * \|	l10n: de.po: fix typo	Ralf Thielow	2015-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| \| \| * \|	l10n: de.po: translate "track" as "versionieren"	Ralf Thielow	2015-01-17	1	-20/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggested-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| \| \| * \|	l10n: zh_CN: translations for git v2.3.0-rc0	Jiang Xin	2015-01-17	1	-830/+853
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| \| \| * \|	l10n: sv.po: Update Swedish translation (2298t0f0u)	Peter Krefting	2015-01-14	1	-842/+865
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| \| \| * \|	l10n: fr.po v2.3.0 round 1	Jean-Noel Avila	2015-01-13	1	-833/+852
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
\| \| \| * \|	l10n: vi.po(2298t): Updated and change Plural-Forms	Tran Ngoc Quan	2015-01-13	1	-1019/+986
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| \| \| * \|	l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)	Jiang Xin	2015-01-13	1	-824/+831
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from v2.3.0-rc0 for git v2.3.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| \| \| * \|	Merge branch 'master' of git://github.com/alexhenrie/git-po	Jiang Xin	2015-01-13	1	-798/+819
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: various fixes
\| \| \| \| * \|	l10n: ca.po: various fixes	Joan Perals	2014-12-23	1	-798/+819
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joan Perals Tresserra <j.pertres@gmail.com>
* \| \| \| \| \|	Merge branch 'sh/asciidoc-git-version-fix'	Junio C Hamano	2015-01-22	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* sh/asciidoc-git-version-fix: Documentation: fix version numbering
\| * \| \| \| \| \|	Documentation: fix version numberingsh/asciidoc-git-version-fix	Sven van Haastregt	2015-01-22	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version numbers in asciidoc-generated content (such as man pages) went missing as of da8a366 (Documentation: refactor common operations into variables). Fix by putting the underscore back in the variable name. Signed-off-by: Sven van Haastregt <svenvh@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \|	Merge branch 'jh/empty-notes'	Junio C Hamano	2015-01-22	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* jh/empty-notes: Fix unclosed here document in t3301.sh
\| * \| \| \| \|	Fix unclosed here document in t3301.shjh/empty-notes	Kacper Kornet	2015-01-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit 908a3203632a02568df230c0fccf9a2cd8da24e6 introduced indentation to here documents in t3301.sh. However in one place <<-EOF was missing -, which broke this test when run with mksh-50d. This commit fixes it. Signed-off-by: Kacper Kornet <draenog@pld-linux.org> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \|	Git 2.3.0-rc1v2.3.0-rc1	Junio C Hamano	2015-01-20	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \|	Merge branch 'jk/http-push-symref-fix'	Junio C Hamano	2015-01-20	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* jk/http-push-symref-fix: http-push: trim trailing newline from remote symref
\| * \| \| \| \| \|	http-push: trim trailing newline from remote symrefjk/http-push-symref-fix	Jeff King	2015-01-14	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we fetch a symbolic ref file from the remote, we get the whole string "ref: refs/heads/master\n", recognize it by skipping past the "ref: ", and store the rest. We should chomp the trailing newline. This bug was introduced in ae021d8 (use skip_prefix to avoid magic numbers, 2014-06-18), which did not notice that the length computation fed to xmemdupz was quietly tweaked by 1 to account for this. We can solve it by explicitly trimming the newline, which is more obvious. Note that we use strbuf_rtrim here, which will actually cut off any trailing whitespace, not just a single newline. This is a good thing, though, as it makes our parsing more liberal (and spaces are not valid in refnames anyway). Signed-off-by: Jeff King <peff@peff.net> Tested-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \| \|	Merge branch 'ak/show-branch-usage-string'	Junio C Hamano	2015-01-20	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* ak/show-branch-usage-string: show-branch: fix indentation of usage string
\| * \| \| \| \| \| \|	show-branch: fix indentation of usage stringak/show-branch-usage-string	Ralf Thielow	2015-01-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Noticed-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \| \| \|	Merge branch 'jk/colors'	Junio C Hamano	2015-01-20	2	-0/+5
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* jk/colors: parse_color: fix return value for numeric color values 0-8
\| * \| \| \| \| \| \|	parse_color: fix return value for numeric color values 0-8	Jeff King	2015-01-20	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When commit 695d95d refactored the color parsing, it missed a "return 0" when parsing literal numbers 0-8 (which represent basic ANSI colors), leading us to report these colors as an error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \| \| \| \| \| \| \|	git-svn: make it play nicely with submodules	Ramkumar Ramachandra	2015-01-15	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's a simple matter of opening the directory specified in the gitfile. [ew: tweaked check to avoid open() on directories] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
* \| \| \| \| \| \| \|	Git::SVN: handle missing ref_id case correctly	Ramkumar Ramachandra	2015-01-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ref_id should not match "refs/remotes/". [ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
* \| \| \| \| \| \| \|	Fifth batch for 2.3 cycle	Junio C Hamano	2015-01-14	1	-2/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully this will be the final feature update for 2.3-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>