summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-151-7/+11
|\
| * fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-071-4/+8
| * fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-071-3/+3
* | Merge branch 'mg/gpg-interface-using-status'Junio C Hamano2013-03-211-1/+1
|\ \ | |/ |/|
| * gpg_interface: allow to request status returnMichael J Gruber2013-02-141-1/+1
| * Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-141-7/+14
| |\
* | \ Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-1/+1
|\ \ \
| * | | Allow custom "comment char"Junio C Hamano2013-01-161-1/+1
| |/ /
* | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano2013-01-101-7/+14
|\ \ \ | |/ / |/| / | |/
| * merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-281-7/+14
* | i18n: fmt-merge-msg: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-8/+8
|/
* Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-06-121-2/+2
|\
| * fmt-merge-msg: make attribution into comment linesJunio C Hamano2012-06-061-2/+2
* | Merge branch 'jk/ident-gecos-strbuf'Junio C Hamano2012-05-291-4/+4
|\ \
| * | fmt-merge-msg: don't use static buffer in record_personJeff King2012-05-221-4/+4
* | | Sync with 1.7.10.3Junio C Hamano2012-05-251-3/+5
|\ \ \ | |/ / |/| |
| * | fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds2012-05-251-3/+5
* | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-271-9/+119
|\ \ \ | |/ / | | / | |/ |/|
| * fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-181-9/+119
* | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-peopleJunio C Hamano2012-03-131-4/+110
|/
* Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-131-3/+4
* Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-091-0/+2
|\
| * Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-051-1/+5
* | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-091-25/+89
|\ \
| * | fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano2011-11-081-2/+70
| * | fmt-merge-msg: package options into a structureJunio C Hamano2011-11-071-15/+14
| * | fmt-merge-msg: avoid early returnsJunio C Hamano2011-11-071-10/+10
| |/
* | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-091-16/+59
|\ \ | |/ |/|
| * fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse errorRamsay Jones2011-10-151-1/+1
| * fmt-merge-msg: use branch.$name.descriptionJunio C Hamano2011-10-071-16/+59
* | 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
View Lorry Controller Status