org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	merge-recursive: point the user to commit when file would be overwritten.	Matthieu Moy	2009-11-22
\| \| \| \| \| \| \| \| \|	The commit-before-pull is well accepted in the DVCS community, but is confusing some new users. This should get them back in the right way when the problem occurs. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	status: make "how to stage" messages optional	Jeff King	2009-09-11
\| \| \| \| \| \| \| \| \|	These messages are nice for new users, but experienced git users know how to manipulate the index, and these messages waste a lot of screen real estate. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	push: make non-fast-forward help message configurable	Jeff King	2009-09-11
	This message is designed to help new users understand what has happened when refs fail to push. However, it does not help experienced users at all, and significantly clutters the output, frequently dwarfing the regular status table and making it harder to see. This patch introduces a general configuration mechanism for optional messages, with this push message as the first example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>