summaryrefslogtreecommitdiff
path: root/advice.h
Commit message (Expand)AuthorAgeFilesLines
* push: switch default from "matching" to "simple"jc/push-2.0-default-to-simpleJunio C Hamano2013-06-181-1/+0
* push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-0/+3
* clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-161-0/+1
* advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-041-1/+2
* Reword "detached HEAD" notificationJunio C Hamano2010-01-291-0/+1
* Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+5
|\
| * Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+5
* | commit: allow suppression of implicit identity adviceJeff King2010-01-141-0/+1
|/
* merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-221-0/+1
* status: make "how to stage" messages optionalJeff King2009-09-111-0/+1
* push: make non-fast-forward help message configurableJeff King2009-09-111-0/+8