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

	Commit message (Expand)	Author	Age
*	i18n: advice: internationalize message for conflicts	Vasco Almeida	2016-06-17
*	i18n: advice: mark string about detached head for translation	Vasco Almeida	2016-06-17
*	merge: grammofix in please-commit-before-merge message	Alex Henrie	2015-10-02
*	pull: check if in unresolved merge state	Paul Tan	2015-06-18
*	standardize usage info string format	Alex Henrie	2015-01-14
*	merge, pull: stop advising 'commit -a' in case of conflict	Matthieu Moy	2014-08-28
*	refactor skip_prefix to return a boolean	Jeff King	2014-06-20
*	Merge branch 'jk/error-resolve-conflict-advice'	Junio C Hamano	2014-06-16
\|\
\| *	error_resolve_conflict: drop quotations around operation	Jeff King	2014-06-03
\| *	error_resolve_conflict: rewrap advice message	Jeff King	2014-06-03
* \|	Merge branch 'jc/push-2.0-default-to-simple'	Junio C Hamano	2014-03-07
\|\ \ \| \|/ \|/\|
\| *	push: switch default from "matching" to "simple"	Junio C Hamano	2013-06-18
* \|	Rename advice.object_name_warning to objectNameWarning	Thomas Rast	2013-07-31
* \|	Merge branch 'mm/rm-coalesce-errors'	Junio C Hamano	2013-06-24
\|\ \
\| * \|	rm: introduce advice.rmHints to shorten messages	Mathieu Lienard--Mayor	2013-06-12
* \| \|	Merge branch 'nd/warn-ambiguous-object-name'	Junio C Hamano	2013-06-11
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	get_sha1: warn about full or short object names that look like refs	Nguyễn Thái Ngọc Duy	2013-05-29
* \| \|	branch: give advice when tracking start-point is missing	Jeff King	2013-04-02
* \| \|	Merge branch 'tb/document-status-u-tradeoff'	Junio C Hamano	2013-03-21
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	status: advise to consider use of -u when read_directory takes too long	Nguyễn Thái Ngọc Duy	2013-03-16
\| \|/
* \|	push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE	Junio C Hamano	2013-01-24
* \|	push: allow already-exists advice to be disabled	Chris Rorvick	2012-12-03
* \|	push: rename config variable for more general use	Chris Rorvick	2012-12-03
\|/
*	Merge branch 'jk/maint-advise-vaddf'	Junio C Hamano	2012-07-24
\|\
\| *	advice: pass varargs to strbuf_vaddf, not strbuf_addf	Jeff King	2012-07-23
* \|	push: Provide situational hints for non-fast-forward errors	Christopher Tiwald	2012-03-19
* \|	Merge branch 'nd/clone-detached'	Junio C Hamano	2012-01-31
\|\ \ \| \|/ \|/\|
\| *	clone: print advice on checking out detached HEAD	Nguyễn Thái Ngọc Duy	2012-01-16
* \|	i18n of multi-line advice messages	Junio C Hamano	2011-12-22
\|/
*	advice: Introduce error_resolve_conflict	Ramkumar Ramachandra	2011-08-04
*	Reword "detached HEAD" notification	Junio C Hamano	2010-01-29
*	Merge branch 'mm/conflict-advice'	Junio C Hamano	2010-01-20
\|\
\| *	Be more user-friendly when refusing to do something because of conflict.	Matthieu Moy	2010-01-12
* \|	commit: allow suppression of implicit identity advice	Jeff King	2010-01-14
\|/
*	merge-recursive: point the user to commit when file would be overwritten.	Matthieu Moy	2009-11-22
*	status: make "how to stage" messages optional	Jeff King	2009-09-11
*	push: make non-fast-forward help message configurable	Jeff King	2009-09-11