summaryrefslogtreecommitdiff
path: root/advice.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/push-2.0-default-to-simple'Junio C Hamano2014-03-071-1/+0
|\
| * push: switch default from "matching" to "simple"jc/push-2.0-default-to-simpleJunio C Hamano2013-06-181-1/+0
* | Merge branch 'jk/gcc-function-attributes'Junio C Hamano2013-07-221-0/+1
|\ \
| * | add missing "format" function attributesJeff King2013-07-091-0/+1
* | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-241-0/+1
|\ \ \
| * | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-121-0/+1
| |/ /
* | | Merge branch 'nd/warn-ambiguous-object-name'Junio C Hamano2013-06-111-0/+1
|\ \ \ | |/ / |/| |
| * | get_sha1: warn about full or short object names that look like refsNguyễn Thái Ngọc Duy2013-05-291-0/+1
* | | branch: give advice when tracking start-point is missingJeff King2013-04-021-0/+1
* | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-211-0/+1
|\ \ \ | |/ / |/| |
| * | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-161-0/+1
| |/
* | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-241-0/+2
* | push: allow already-exists advice to be disabledChris Rorvick2012-12-031-0/+1
* | push: rename config variable for more general useChris Rorvick2012-12-031-1/+1
|/
* push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-0/+3
* clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-161-0/+1
* advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-041-1/+2
* Reword "detached HEAD" notificationJunio C Hamano2010-01-291-0/+1
* Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+5
|\
| * Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-0/+5
* | commit: allow suppression of implicit identity adviceJeff King2010-01-141-0/+1
|/
* merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-221-0/+1
* status: make "how to stage" messages optionalJeff King2009-09-111-0/+1
* push: make non-fast-forward help message configurableJeff King2009-09-111-0/+8
View Lorry Controller Status