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