summaryrefslogtreecommitdiff
path: root/advice.c
AgeCommit message (Expand)AuthorFilesLines
2015-10-02merge: grammofix in please-commit-before-merge messageLibravatar Alex Henrie1-1/+1
2015-06-18pull: check if in unresolved merge stateLibravatar Paul Tan1-0/+8
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-1/+1
2014-08-28merge, pull: stop advising 'commit -a' in case of conflictLibravatar Matthieu Moy1-2/+1
2014-06-20refactor skip_prefix to return a booleanLibravatar Jeff King1-1/+4
2014-06-16Merge branch 'jk/error-resolve-conflict-advice'Libravatar Junio C Hamano1-5/+4
2014-06-03error_resolve_conflict: drop quotations around operationLibravatar Jeff King1-1/+1
2014-06-03error_resolve_conflict: rewrap advice messageLibravatar Jeff King1-4/+3
2014-03-07Merge branch 'jc/push-2.0-default-to-simple'Libravatar Junio C Hamano1-2/+0
2013-07-31Rename advice.object_name_warning to objectNameWarningLibravatar Thomas Rast1-1/+1
2013-06-24Merge branch 'mm/rm-coalesce-errors'Libravatar Junio C Hamano1-0/+2
2013-06-18push: switch default from "matching" to "simple"Libravatar Junio C Hamano1-2/+0
2013-06-12rm: introduce advice.rmHints to shorten messagesLibravatar Mathieu Lienard--Mayor1-0/+2
2013-06-11Merge branch 'nd/warn-ambiguous-object-name'Libravatar Junio C Hamano1-0/+2
2013-05-29get_sha1: warn about full or short object names that look like refsLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2013-04-02branch: give advice when tracking start-point is missingLibravatar Jeff King1-0/+2
2013-03-21Merge branch 'tb/document-status-u-tradeoff'Libravatar Junio C Hamano1-0/+2
2013-03-16status: advise to consider use of -u when read_directory takes too longLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2013-01-24push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCELibravatar Junio C Hamano1-0/+4
2012-12-03push: allow already-exists advice to be disabledLibravatar Chris Rorvick1-0/+2
2012-12-03push: rename config variable for more general useLibravatar Chris Rorvick1-2/+5
2012-07-24Merge branch 'jk/maint-advise-vaddf'Libravatar Junio C Hamano1-1/+1
2012-07-23advice: pass varargs to strbuf_vaddf, not strbuf_addfLibravatar Jeff King1-1/+1
2012-03-19push: Provide situational hints for non-fast-forward errorsLibravatar Christopher Tiwald1-0/+6
2012-01-31Merge branch 'nd/clone-detached'Libravatar Junio C Hamano1-0/+14
2012-01-16clone: print advice on checking out detached HEADLibravatar Nguyễn Thái Ngọc Duy1-0/+14
2011-12-22i18n of multi-line advice messagesLibravatar Junio C Hamano1-7/+16
2011-08-04advice: Introduce error_resolve_conflictLibravatar Ramkumar Ramachandra1-7/+24
2010-01-29Reword "detached HEAD" notificationLibravatar Junio C Hamano1-0/+2
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano1-0/+16
2010-01-14commit: allow suppression of implicit identity adviceLibravatar Jeff King1-0/+2
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-0/+16
2009-11-22merge-recursive: point the user to commit when file would be overwritten.Libravatar Matthieu Moy1-0/+2
2009-09-11status: make "how to stage" messages optionalLibravatar Jeff King1-0/+2
2009-09-11push: make non-fast-forward help message configurableLibravatar Jeff King1-0/+25