aboutsummaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
Commit message (Expand)AuthorAge
* Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-18
* Fix sparse warningsStephen Boyd2011-03-22
* Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-03
* Merge branch 'rr/fmt-merge-msg'Junio C Hamano2010-09-29
|\
| * merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra2010-09-09
| * merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-09
| * fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra2010-09-09
* | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-03
|\ \ | |/
| * fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-18
* | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-05
|/
* Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-30
|\
| * string_list: Fix argument order for string_list_appendJulian Phillips2010-06-27
* | merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-10
* | fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan2010-05-10
* | fmt-merge-msg: refactor merge title formattingTay Ray Chuan2010-05-10
* | fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan2010-05-10
|/
* fmt-merge-msg: hide summary optionStephen Boyd2010-03-24
* fmt-merge-msg: remove custom string_list implementationStephen Boyd2010-03-24
* fmt-merge-msg: use pretty.c routinesStephen Boyd2010-03-24
* fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-24
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22