summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
AgeCommit message (Expand)Author
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy
2011-12-09Merge branch 'nd/resolve-ref'Junio C Hamano
2011-12-09Merge branch 'jc/pull-signed-tag'Junio C Hamano
2011-12-09Merge branch 'jc/request-pull-show-head-4'Junio C Hamano
2011-12-06Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy
2011-11-08fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano
2011-11-07fmt-merge-msg: package options into a structureJunio C Hamano
2011-11-07fmt-merge-msg: avoid early returnsJunio C Hamano
2011-10-16fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse errorRamsay Jones
2011-10-07fmt-merge-msg: use branch.$name.descriptionJunio C Hamano
2011-09-18Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy
2011-03-22Fix sparse warningsStephen Boyd
2010-11-03Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy
2010-09-29Merge branch 'rr/fmt-merge-msg'Junio C Hamano
2010-09-09merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra
2010-09-09fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra
2010-09-03Merge branch 'jn/update-contrib-example-merge'Junio C Hamano
2010-08-18fmt-merge-msg -m to override merge titleJonathan Nieder
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan
2010-05-10fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan
2010-05-10fmt-merge-msg: refactor merge title formattingTay Ray Chuan
2010-05-10fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan
2010-03-25fmt-merge-msg: hide summary optionStephen Boyd
2010-03-25fmt-merge-msg: remove custom string_list implementationStephen Boyd
2010-03-25fmt-merge-msg: use pretty.c routinesStephen Boyd
2010-03-25fmt-merge-msg: be quiet if nothing to mergeStephen Boyd
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds