Age | Commit message (Expand) | Author |
---|---|---|
2011-08-05 | advice: Introduce error_resolve_conflict | Ramkumar Ramachandra |
2010-01-30 | Reword "detached HEAD" notification | Junio C Hamano |
2010-01-21 | Merge branch 'mm/conflict-advice' | Junio C Hamano |
2010-01-14 | commit: allow suppression of implicit identity advice | Jeff King |
2010-01-13 | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy |
2009-11-23 | merge-recursive: point the user to commit when file would be overwritten. | Matthieu Moy |
2009-09-12 | status: make "how to stage" messages optional | Jeff King |
2009-09-12 | push: make non-fast-forward help message configurable | Jeff King |