tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2017-01-17	Merge branch 'sb/unpack-trees-grammofix' into maint	Junio C Hamano	1	-1/+1
	* sb/unpack-trees-grammofix: unpack-trees: fix grammar for untracked files in directories
2016-12-05	unpack-trees: fix grammar for untracked files in directories	Stefan Beller	1	-1/+1
	Noticed-by: David Turner <dturner@twosigma.com> Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: David Turner <dturner@twosigma.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-27	unpack-trees: fix English grammar in do-this-before-that messages	Alex Henrie	1	-5/+5
	Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-12	i18n: unpack-trees: avoid substituting only a verb in sentences	Vasco Almeida	1	-9/+9
	Instead of reusing the same set of message templates for checkout and other actions and substituting the verb with "%s", prepare separate message templates for each known action. That would make it easier for translation into languages where the same verb may conjugate differently depending on the message we are giving. See gettext documentation for details: http://www.gnu.org/software/gettext/manual/html_node/Preparing-Strings.html Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-09-21	unpack-trees: print "Aborting" to stderr	Michael J Gruber	1	-0/+5
	display_error_msgs() prints all the errors to stderr already (if any), followed by "Aborting" (if any) to stdout. Make the latter go to stderr instead. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-15	use persistent memory for rejected paths	Clemens Buchacher	1	-8/+8
	An aborted merge prints the list of rejected paths as part of the error message. Since commit f66caaf9 (do not overwrite files in leading path), some of those paths do not have static buffers, so we have to keep a copy. Use string_list's to accomplish this. This changes the order of the list to the order in which the paths are processed. Previously, it was reversed. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-09-03	t7609-merge-co-error-msgs: test non-fast forward case too.	Matthieu Moy	1	-2/+10
	Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-11	t7609: test merge and checkout error messages	Diane Gasselin	1	-0/+125
	Test porcelain and plumbing error messages for different types of errors of merge and checkout. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>