aboutsummaryrefslogtreecommitdiff
path: root/advice.h
Commit message (Expand)AuthorAge
* pull: check if in unresolved merge statePaul Tan2015-06-18
* Merge branch 'jc/push-2.0-default-to-simple'Junio C Hamano2014-03-07
|\
| * push: switch default from "matching" to "simple"Junio C Hamano2013-06-18
* | Merge branch 'jk/gcc-function-attributes'Junio C Hamano2013-07-22
|\ \
| * | add missing "format" function attributesJeff King2013-07-09
* | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-24
|\ \ \
| * | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-12
| |/ /
* | | Merge branch 'nd/warn-ambiguous-object-name'Junio C Hamano2013-06-11
|\ \ \ | |/ / |/| |
| * | get_sha1: warn about full or short object names that look like refsNguyễn Thái Ngọc Duy2013-05-29
* | | branch: give advice when tracking start-point is missingJeff King2013-04-02
* | | Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano2013-03-21
|\ \ \ | |/ / |/| |
| * | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-16
| |/
* | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-24
* | push: allow already-exists advice to be disabledChris Rorvick2012-12-03
* | push: rename config variable for more general useChris Rorvick2012-12-03
|/
* push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-19
* clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-16
* advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-04
* Reword "detached HEAD" notificationJunio C Hamano2010-01-29
* Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-20
|\
| * Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-12
* | commit: allow suppression of implicit identity adviceJeff King2010-01-14
|/
* merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-22
* status: make "how to stage" messages optionalJeff King2009-09-11
* push: make non-fast-forward help message configurableJeff King2009-09-11