aboutsummaryrefslogtreecommitdiff
path: root/advice.c
Commit message (Expand)AuthorAge
* 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