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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/maint-advise-vaddf' into maint	Junio C Hamano	2012-07-30
\|\
\| *	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