summaryrefslogtreecommitdiff
path: root/advice.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-advise-vaddf' into maintJunio C Hamano2012-07-301-1/+1
|\
| * advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King2012-07-231-1/+1
* | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-0/+6
* | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-311-0/+14
|\ \ | |/ |/|
| * clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-161-0/+14
* | i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-221-7/+16
|/
* advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-041-7/+24
* Reword "detached HEAD" notificationJunio C Hamano2010-01-291-0/+2
* Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+16
|\
| * Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+16
* | commit: allow suppression of implicit identity adviceJeff King2010-01-141-0/+2
|/
* merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-221-0/+2
* status: make "how to stage" messages optionalJeff King2009-09-111-0/+2
* push: make non-fast-forward help message configurableJeff King2009-09-111-0/+25