summaryrefslogtreecommitdiff
path: root/advice.c
AgeCommit message (Expand)AuthorFilesLines
2011-08-04advice: Introduce error_resolve_conflictLibravatar Ramkumar Ramachandra1-7/+24
2010-01-29Reword "detached HEAD" notificationLibravatar Junio C Hamano1-0/+2
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano1-0/+16
2010-01-14commit: allow suppression of implicit identity adviceLibravatar Jeff King1-0/+2
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-0/+16
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Libravatar Matthieu Moy1-0/+2
2009-09-11status: make "how to stage" messages optionalLibravatar Jeff King1-0/+2
2009-09-11push: make non-fast-forward help message configurableLibravatar Jeff King1-0/+25