summaryrefslogtreecommitdiff
path: root/advice.h
AgeCommit message (Expand)AuthorFilesLines
2012-12-03push: rename config variable for more general useLibravatar Chris Rorvick1-1/+1
2012-03-19push: Provide situational hints for non-fast-forward errorsLibravatar Christopher Tiwald1-0/+3
2012-01-16clone: print advice on checking out detached HEADLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2011-08-04advice: Introduce error_resolve_conflictLibravatar Ramkumar Ramachandra1-1/+2
2010-01-29Reword "detached HEAD" notificationLibravatar Junio C Hamano1-0/+1
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano1-0/+5
2010-01-14commit: allow suppression of implicit identity adviceLibravatar Jeff King1-0/+1
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-0/+5
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Libravatar Matthieu Moy1-0/+1
2009-09-11status: make "how to stage" messages optionalLibravatar Jeff King1-0/+1
2009-09-11push: make non-fast-forward help message configurableLibravatar Jeff King1-0/+8