aboutsummaryrefslogtreecommitdiff
path: root/advice.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/maint-advise-vaddf' into maintJunio C Hamano2012-07-30
|\
| * advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King2012-07-23
* | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-19
* | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-31
|\ \ | |/ |/|
| * clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-16
* | i18n of multi-line advice messagesJunio C Hamano2011-12-22
|/
* advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-04
* Reword "detached HEAD" notificationJunio C Hamano2010-01-29
* 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