summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
Commit message (Expand)AuthorAgeFilesLines
* Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy2011-09-181-1/+1
* Fix sparse warningsStephen Boyd2011-03-221-1/+1
* Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-031-3/+3
* Merge branch 'rr/fmt-merge-msg'Junio C Hamano2010-09-291-28/+32
|\
| * merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra2010-09-091-9/+7
| * merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-091-10/+18
| * fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_lenRamkumar Ramachandra2010-09-091-16/+14
* | Merge branch 'jn/update-contrib-example-merge'Junio C Hamano2010-09-031-2/+16
|\ \ | |/
| * fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-181-2/+16
* | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-051-3/+3
|/
* Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-301-9/+9
|\
| * string_list: Fix argument order for string_list_appendJulian Phillips2010-06-271-9/+9
* | merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-101-0/+3
* | fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan2010-05-101-4/+9
* | fmt-merge-msg: refactor merge title formattingTay Ray Chuan2010-05-101-29/+36
* | fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan2010-05-101-1/+6
|/
* fmt-merge-msg: hide summary optionStephen Boyd2010-03-241-1/+3
* fmt-merge-msg: remove custom string_list implementationStephen Boyd2010-03-241-83/+44
* fmt-merge-msg: use pretty.c routinesStephen Boyd2010-03-241-21/+8
* fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-241-0/+3
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+381
View Lorry Controller Status