summaryrefslogtreecommitdiff
path: root/advice.c
Commit message (Expand)AuthorAgeFilesLines
* pull: check if in unresolved merge statePaul Tan2015-06-181-0/+8
* standardize usage info string formatAlex Henrie2015-01-141-1/+1
* merge, pull: stop advising 'commit -a' in case of conflictmm/discourage-commit-a-to-finish-conflict-resolutionMatthieu Moy2014-08-281-2/+1
* refactor skip_prefix to return a booleanJeff King2014-06-201-1/+4
* Merge branch 'jk/error-resolve-conflict-advice'Junio C Hamano2014-06-161-5/+4
|\
| * error_resolve_conflict: drop quotations around operationjk/error-resolve-conflict-adviceJeff King2014-06-031-1/+1
| * error_resolve_conflict: rewrap advice messageJeff King2014-06-031-4/+3
* | Merge branch 'jc/push-2.0-default-to-simple'Junio C Hamano2014-03-071-2/+0
|\ \ | |/ |/|
| * push: switch default from "matching" to "simple"jc/push-2.0-default-to-simpleJunio C Hamano2013-06-181-2/+0
* | Rename advice.object_name_warning to objectNameWarningThomas Rast2013-07-311-1/+1
* | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-241-0/+2
|\ \
| * | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-121-0/+2
* | | Merge branch 'nd/warn-ambiguous-object-name'Junio C Hamano2013-06-111-0/+2
|\ \ \ | |/ / |/| |
| * | get_sha1: warn about full or short object names that look like refsNguyễn Thái Ngọc Duy2013-05-291-0/+2
* | | branch: give advice when tracking start-point is missingJeff King2013-04-021-0/+2
* | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-211-0/+2
|\ \ \ | |/ / |/| |
| * | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-161-0/+2
| |/
* | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-241-0/+4
* | push: allow already-exists advice to be disabledChris Rorvick2012-12-031-0/+2
* | push: rename config variable for more general useChris Rorvick2012-12-031-2/+5
|/
* Merge branch 'jk/maint-advise-vaddf'Junio C Hamano2012-07-241-1/+1
|\
| * advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King2012-07-231-1/+1
* | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-0/+6
* | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-311-0/+14
|\ \ | |/ |/|
| * clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-161-0/+14
* | i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-221-7/+16
|/
* advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-041-7/+24
* Reword "detached HEAD" notificationJunio C Hamano2010-01-291-0/+2
* Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+16
|\
| * Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+16
* | commit: allow suppression of implicit identity adviceJeff King2010-01-141-0/+2
|/
* merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-221-0/+2
* status: make "how to stage" messages optionalJeff King2009-09-111-0/+2
* push: make non-fast-forward help message configurableJeff King2009-09-111-0/+25
View Lorry Controller Status