git / advice.h

Author Commit Message Labels Comments Date
Ramkumar Ramachandra avatarRamkumar Ramachandra
advice: Introduce error_resolve_conflict
Branches
maint
Default avatar Junio C Hamano
Reword "detached HEAD" notification
Default avatar Junio C Hamano
Merge branch 'mm/conflict-advice'
Default avatar Jeff King
commit: allow suppression of implicit identity advice
Default avatar Matthieu Moy
Be more user-friendly when refusing to do something because of conflict.
Default avatar Matthieu Moy
merge-recursive: point the user to commit when file would be overwritten.
Default avatar Jeff King
status: make "how to stage" messages optional
Default avatar Jeff King
push: make non-fast-forward help message configurable
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.