summaryrefslogtreecommitdiff
path: root/advice.c
AgeCommit message (Expand)Author
2012-03-20push: Provide situational hints for non-fast-forward errorsChristopher Tiwald
2012-02-01Merge branch 'nd/clone-detached'Junio C Hamano
2012-01-17clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy
2011-12-22i18n of multi-line advice messagesJunio C Hamano
2011-08-04advice: Introduce error_resolve_conflictRamkumar Ramachandra
2010-01-30Reword "detached HEAD" notificationJunio C Hamano
2010-01-20Merge branch 'mm/conflict-advice'Junio C Hamano
2010-01-14commit: allow suppression of implicit identity adviceJeff King
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy
2009-11-23merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy
2009-09-12status: make "how to stage" messages optionalJeff King
2009-09-12push: make non-fast-forward help message configurableJeff King