aboutsummaryrefslogtreecommitdiff
path: root/advice.h
Commit message (Expand)AuthorAge
* Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-20
|\
| * Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-12
* | commit: allow suppression of implicit identity adviceJeff King2010-01-14
|/
* merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-22
* status: make "how to stage" messages optionalJeff King2009-09-11
* push: make non-fast-forward help message configurableJeff King2009-09-11