summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
AgeCommit message (Expand)AuthorFilesLines
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
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+381