summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-081-2/+2
* | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-2/+2
|/
* builtin/fmt-merge-message: convert to struct object_idbrian m. carlson2017-02-221-35/+35
* remove unnecessary check before QSORTRené Scharfe2016-09-291-6/+4
* use QSORTRené Scharfe2016-09-291-4/+2
* use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-151-1/+1
* use strbuf_addstr() instead of strbuf_addf() with "%s"rs/use-strbuf-addstrRené Scharfe2016-08-051-1/+1
* Remove get_object_hash.brian m. carlson2015-11-201-2/+2
* Convert struct object to object_idbrian m. carlson2015-11-201-1/+1
* Add several uses of get_object_hash.brian m. carlson2015-11-201-2/+2
* Merge branch 'rs/pop-commit'Junio C Hamano2015-10-301-6/+3
|\
| * use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-261-6/+3
* | refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-221-0/+1
|/
* Merge branch 'jc/plug-fmt-merge-msg-leak'Junio C Hamano2015-05-111-5/+11
|\
| * fmt-merge-msg: plug small leak of commit bufferjc/plug-fmt-merge-msg-leakJunio C Hamano2015-04-201-5/+11
* | standardize usage info string formatAlex Henrie2015-01-141-1/+1
* | Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano2014-12-221-2/+1
|\ \
| * | use strbuf_complete_line() for adding a newline if neededrs/use-strbuf-complete-lineRené Scharfe2014-12-121-2/+1
* | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
|/ /
* | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-091-5/+2
|\ \
| * | use xstrfmt to replace xmalloc + sprintfJeff King2014-06-191-5/+2
* | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-091-5/+5
|\ \ \
| * | | use skip_prefix to avoid repeating stringsJeff King2014-06-201-3/+3
| * | | refactor skip_prefix to return a booleanJeff King2014-06-201-1/+1
| * | | avoid using skip_prefix as a booleanJeff King2014-06-181-1/+1
| |/ /
* | | commit: record buffer length in cacheJeff King2014-06-131-1/+1
| |/ |/|
* | use get_commit_buffer everywhereJeff King2014-06-131-1/+4
|/
* replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-5/+5
* 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
|/
View Lorry Controller Status