summaryrefslogtreecommitdiff
path: root/advice.h
Commit message (Expand)AuthorAgeFilesLines
* Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+5
* 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