aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/fmt-merge-msg.c
AgeCommit message (Expand)AuthorFilesLines
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano1-0/+4
2020-03-24Lib-ify fmt-merge-msgDenton Liu1-654/+1
2020-03-05Merge branch 'hi/gpg-use-check-signature'Junio C Hamano1-7/+4
2020-02-28Revert "gpg-interface: prefer check_signature() for GPG verification"Junio C Hamano1-7/+4
2019-12-10Merge branch 'hi/gpg-use-check-signature'Junio C Hamano1-4/+7
2019-11-30gpg-interface: prefer check_signature() for GPG verificationHans Jerry Illikainen1-4/+7
2019-11-27fmt-merge-msg: use skip_prefix() instead of starts_with()René Scharfe1-5/+4
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-1/+1
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-3/+3
2018-09-17Merge branch 'ds/reachable'Junio C Hamano1-0/+1
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King1-2/+2
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-08-15Merge branch 'nd/i18n'Junio C Hamano1-1/+1
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-3/+6
2018-08-02Merge branch 'bc/object-id'Junio C Hamano1-9/+10
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy1-1/+1
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-07-16builtin/fmt-merge-msg: make hash independentbrian m. carlson1-9/+10
2018-06-29tag: add repository argument to deref_tagStefan Beller1-1/+2
2018-06-29commit: add repository argument to lookup_commitStefan Beller1-1/+1
2018-06-29object: add repository argument to parse_objectStefan Beller1-2/+4
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-1/+1
2018-03-14builtin/fmt-merge-msg: convert remaining code to object_idbrian m. carlson1-2/+2
2017-12-27Merge branch 'rs/fmt-merge-msg-string-leak-fix'Junio C Hamano1-1/+2
2017-12-07fmt-merge-msg: avoid leaking strbuf in shortlog()René Scharfe1-1/+2
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano1-1/+1
2017-11-08reduce_heads: fix memory leaksMartin Ågren1-1/+1
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson1-1/+1
2017-08-11Merge branch 'dc/fmt-merge-msg-microcleanup'Junio C Hamano1-1/+2
2017-07-25fmt-merge-msg: fix coding styleDimitrios Christidis1-1/+2
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-08object: convert parse_object* to take struct object_idbrian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-2/+2
2017-02-22builtin/fmt-merge-message: convert to struct object_idbrian m. carlson1-35/+35
2016-09-29remove unnecessary check before QSORTRené Scharfe1-6/+4
2016-09-29use QSORTRené Scharfe1-4/+2
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe1-1/+1
2016-08-05use strbuf_addstr() instead of strbuf_addf() with "%s"René Scharfe1-1/+1
2015-11-20Remove get_object_hash.brian m. carlson1-2/+2
2015-11-20Convert struct object to object_idbrian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.brian m. carlson1-2/+2
2015-10-30Merge branch 'rs/pop-commit'Junio C Hamano1-6/+3
2015-10-26use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe1-6/+3
2015-06-22refs: move the remaining ref module declarations to refs.hMichael Haggerty1-0/+1
2015-05-11Merge branch 'jc/plug-fmt-merge-msg-leak'Junio C Hamano1-5/+11
2015-04-20fmt-merge-msg: plug small leak of commit bufferJunio C Hamano1-5/+11
2015-01-14standardize usage info string formatAlex Henrie1-1/+1
2014-12-22Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano1-2/+1
2014-12-12use strbuf_complete_line() for adding a newline if neededRené Scharfe1-2/+1
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-1/+1
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano1-5/+2
2014-07-09Merge branch 'jk/skip-prefix'Junio C Hamano1-5/+5
2014-06-20use skip_prefix to avoid repeating stringsJeff King1-3/+3
2014-06-20refactor skip_prefix to return a booleanJeff King1-1/+1
2014-06-19use xstrfmt to replace xmalloc + sprintfJeff King1-5/+2
2014-06-18avoid using skip_prefix as a booleanJeff King1-1/+1
2014-06-13commit: record buffer length in cacheJeff King1-1/+1
2014-06-13use get_commit_buffer everywhereJeff King1-1/+4
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-5/+5
2013-04-15Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano1-7/+11
2013-04-07fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow1-4/+8
2013-04-07fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow1-3/+3
2013-03-21Merge branch 'mg/gpg-interface-using-status'Junio C Hamano1-1/+1
2013-02-14gpg_interface: allow to request status returnMichael J Gruber1-1/+1
2013-02-04Merge branch 'jc/custom-comment-char'Junio C Hamano1-1/+1
2013-01-16Allow custom "comment char"Junio C Hamano1-1/+1
2013-01-14Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano1-7/+14
2013-01-10Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano1-7/+14
2012-12-28merge --no-edit: do not credit people involved in the side branchJunio C Hamano1-7/+14
2012-08-20i18n: fmt-merge-msg: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-8/+8
2012-06-12Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano1-2/+2
2012-06-06fmt-merge-msg: make attribution into comment linesJunio C Hamano1-2/+2
2012-05-29Merge branch 'jk/ident-gecos-strbuf'Junio C Hamano1-4/+4
2012-05-25Sync with 1.7.10.3Junio C Hamano1-3/+5
2012-05-25fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds1-3/+5
2012-05-22fmt-merge-msg: don't use static buffer in record_personJeff King1-4/+4
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano1-9/+119
2012-04-18fmt-merge-msg: discard needless merge parentsJunio C Hamano1-9/+119
2012-03-13fmt-merge-msg: show those involved in a merged seriesJunio C Hamano1-4/+110
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy1-3/+4
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano1-0/+2
2011-12-09Merge branch 'jc/pull-signed-tag'Junio C Hamano1-25/+89
2011-12-09Merge branch 'jc/request-pull-show-head-4'Junio C Hamano1-16/+59
2011-12-05Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy1-1/+5
2011-11-08fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano1-2/+70
2011-11-07fmt-merge-msg: package options into a structureJunio C Hamano1-15/+14
2011-11-07fmt-merge-msg: avoid early returnsJunio C Hamano1-10/+10
2011-10-15fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse errorRamsay Jones1-1/+1
2011-10-07fmt-merge-msg: use branch.$name.descriptionJunio C Hamano1-16/+59
2011-09-18Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy1-1/+1
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy1-3/+3
2010-09-29Merge branch 'rr/fmt-merge-msg'Junio C Hamano1-28/+32
2010-09-09merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra1-9/+7
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra1-10/+18
2010-09-09fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra1-16/+14
2010-09-03Merge branch 'jn/update-contrib-example-merge'Junio C Hamano1-2/+16
2010-08-18fmt-merge-msg -m to override merge titleJonathan Nieder1-2/+16
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina1-3/+3
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano1-9/+9
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips1-9/+9
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan1-0/+3
2010-05-10fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan1-4/+9
2010-05-10fmt-merge-msg: refactor merge title formattingTay Ray Chuan1-29/+36
2010-05-10fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan1-1/+6
2010-03-24fmt-merge-msg: hide summary optionStephen Boyd1-1/+3
2010-03-24fmt-merge-msg: remove custom string_list implementationStephen Boyd1-83/+44
2010-03-24fmt-merge-msg: use pretty.c routinesStephen Boyd1-21/+8
2010-03-24fmt-merge-msg: be quiet if nothing to mergeStephen Boyd1-0/+3
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+381
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-16 11:10:05 +0000