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