summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
AgeCommit message (Expand)AuthorFilesLines
2013-04-26Merge branch 'rt/commentchar-fmt-merge-msg' into maintLibravatar 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-04-03Merge branch 'mg/gpg-interface-using-status' into maintLibravatar 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
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionLibravatar Nguyễn Thái Ngọc Duy1-3/+4
2011-12-09Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-0/+2
2011-12-09Merge branch 'jc/pull-signed-tag'Libravatar Junio C Hamano1-25/+89
2011-12-09Merge branch 'jc/request-pull-show-head-4'Libravatar Junio C Hamano1-16/+59
2011-12-05Copy resolve_ref() return value for longer useLibravatar Nguyễn Thái Ngọc Duy1-1/+5
2011-11-08fmt-merge-msg: Add contents of merged tag in the merge messageLibravatar Junio C Hamano1-2/+70
2011-11-07fmt-merge-msg: package options into a structureLibravatar Junio C Hamano1-15/+14
2011-11-07fmt-merge-msg: avoid early returnsLibravatar Junio C Hamano1-10/+10
2011-10-15fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse errorLibravatar Ramsay Jones1-1/+1
2011-10-07fmt-merge-msg: use branch.$name.descriptionLibravatar Junio C Hamano1-16/+59
2011-09-18Accept tags in HEAD or MERGE_HEADLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeLibravatar Matthieu Moy1-3/+3
2010-09-29Merge branch 'rr/fmt-merge-msg'Libravatar Junio C Hamano1-28/+32
2010-09-09merge: Make 'merge.log' an integer or boolean optionLibravatar Ramkumar Ramachandra1-9/+7
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesLibravatar Ramkumar Ramachandra1-10/+18
2010-09-09fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenLibravatar Ramkumar Ramachandra1-16/+14
2010-09-03Merge branch 'jn/update-contrib-example-merge'Libravatar Junio C Hamano1-2/+16
2010-08-18fmt-merge-msg -m to override merge titleLibravatar Jonathan Nieder1-2/+16
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Libravatar Thiago Farina1-3/+3
2010-06-30Merge branch 'jp/string-list-api-cleanup'Libravatar Junio C Hamano1-9/+9
2010-06-27string_list: Fix argument order for string_list_appendLibravatar Julian Phillips1-9/+9
2010-05-10merge: --log appends shortlog to message if specifiedLibravatar Tay Ray Chuan1-0/+3
2010-05-10fmt-merge-msg: add function to append shortlog onlyLibravatar Tay Ray Chuan1-4/+9
2010-05-10fmt-merge-msg: refactor merge title formattingLibravatar Tay Ray Chuan1-29/+36
2010-05-10fmt-merge-msg: minor refactor of fmt_merge_msg()Libravatar Tay Ray Chuan1-1/+6
2010-03-24fmt-merge-msg: hide summary optionLibravatar Stephen Boyd1-1/+3
2010-03-24fmt-merge-msg: remove custom string_list implementationLibravatar Stephen Boyd1-83/+44
2010-03-24fmt-merge-msg: use pretty.c routinesLibravatar Stephen Boyd1-21/+8
2010-03-24fmt-merge-msg: be quiet if nothing to mergeLibravatar Stephen Boyd1-0/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:36:20 +0000