summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
AgeCommit message (Expand)AuthorFilesLines
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-05-08object: convert parse_object* to take struct object_idLibravatar brian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idLibravatar brian m. carlson1-2/+2
2017-02-22builtin/fmt-merge-message: convert to struct object_idLibravatar brian m. carlson1-35/+35
2016-09-29remove unnecessary check before QSORTLibravatar René Scharfe1-6/+4
2016-09-29use QSORTLibravatar René Scharfe1-4/+2
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2Libravatar René Scharfe1-1/+1
2016-08-05use strbuf_addstr() instead of strbuf_addf() with "%s"Libravatar René Scharfe1-1/+1
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-2/+2
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-2/+2
2015-10-30Merge branch 'rs/pop-commit'Libravatar Junio C Hamano1-6/+3
2015-10-26use pop_commit() for consuming the first entry of a struct commit_listLibravatar René Scharfe1-6/+3
2015-06-22refs: move the remaining ref module declarations to refs.hLibravatar Michael Haggerty1-0/+1
2015-05-11Merge branch 'jc/plug-fmt-merge-msg-leak'Libravatar Junio C Hamano1-5/+11
2015-04-20fmt-merge-msg: plug small leak of commit bufferLibravatar Junio C Hamano1-5/+11
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-1/+1
2014-12-22Merge branch 'rs/use-strbuf-complete-line'Libravatar Junio C Hamano1-2/+1
2014-12-12use strbuf_complete_line() for adding a newline if neededLibravatar René Scharfe1-2/+1
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldLibravatar Ronnie Sahlberg1-1/+1
2014-07-09Merge branch 'jk/xstrfmt'Libravatar Junio C Hamano1-5/+2
2014-07-09Merge branch 'jk/skip-prefix'Libravatar Junio C Hamano1-5/+5
2014-06-20use skip_prefix to avoid repeating stringsLibravatar Jeff King1-3/+3
2014-06-20refactor skip_prefix to return a booleanLibravatar Jeff King1-1/+1
2014-06-19use xstrfmt to replace xmalloc + sprintfLibravatar Jeff King1-5/+2
2014-06-18avoid using skip_prefix as a booleanLibravatar Jeff King1-1/+1
2014-06-13commit: record buffer length in cacheLibravatar Jeff King1-1/+1
2014-06-13use get_commit_buffer everywhereLibravatar Jeff King1-1/+4
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-5/+5
2013-04-15Merge branch 'rt/commentchar-fmt-merge-msg'Libravatar Junio C Hamano1-7/+11
2013-04-07fmt-merge-msg: use core.commentchar in tag signatures completelyLibravatar Ralf Thielow1-4/+8
2013-04-07fmt-merge-msg: respect core.commentchar in people creditsLibravatar Ralf Thielow1-3/+3
2013-03-21Merge branch 'mg/gpg-interface-using-status'Libravatar Junio C Hamano1-1/+1
2013-02-14gpg_interface: allow to request status returnLibravatar Michael J Gruber1-1/+1
2013-02-04Merge branch 'jc/custom-comment-char'Libravatar Junio C Hamano1-1/+1
2013-01-16Allow custom "comment char"Libravatar Junio C Hamano1-1/+1
2013-01-14Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintLibravatar Junio C Hamano1-7/+14
2013-01-10Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Libravatar Junio C Hamano1-7/+14
2012-12-28merge --no-edit: do not credit people involved in the side branchLibravatar Junio C Hamano1-7/+14
2012-08-20i18n: fmt-merge-msg: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-8/+8
2012-06-12Merge branch 'jc/fmt-merge-msg-people'Libravatar Junio C Hamano1-2/+2
2012-06-06fmt-merge-msg: make attribution into comment linesLibravatar Junio C Hamano1-2/+2
2012-05-29Merge branch 'jk/ident-gecos-strbuf'Libravatar Junio C Hamano1-4/+4
2012-05-25Sync with 1.7.10.3Libravatar Junio C Hamano1-3/+5
2012-05-25fmt-merge-message: add empty line between tag and signature verificationLibravatar Linus Torvalds1-3/+5
2012-05-22fmt-merge-msg: don't use static buffer in record_personLibravatar Jeff King1-4/+4
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Libravatar Junio C Hamano1-9/+119
2012-04-18fmt-merge-msg: discard needless merge parentsLibravatar Junio C Hamano1-9/+119
2012-03-13fmt-merge-msg: show those involved in a merged seriesLibravatar Junio C Hamano1-4/+110