aboutsummaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-05
|\
| * fmt-merge-msg: plug small leak of commit bufferJunio C Hamano2015-04-20
* | standardize usage info string formatAlex Henrie2015-01-14
* | Merge branch 'rs/use-strbuf-complete-line'Junio C Hamano2014-12-22
|\ \
| * | use strbuf_complete_line() for adding a newline if neededRené Scharfe2014-12-12
* | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-15
|/ /
* | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-09
|\ \
| * | use xstrfmt to replace xmalloc + sprintfJeff King2014-06-19
* | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-09
|\ \ \
| * | | use skip_prefix to avoid repeating stringsJeff King2014-06-20
| * | | refactor skip_prefix to return a booleanJeff King2014-06-20
| * | | avoid using skip_prefix as a booleanJeff King2014-06-18
| |/ /
* | | commit: record buffer length in cacheJeff King2014-06-13
| |/ |/|
* | use get_commit_buffer everywhereJeff King2014-06-13
|/
* replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
* Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-15
|\
| * fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-07
| * fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-07
* | Merge branch 'mg/gpg-interface-using-status'Junio C Hamano2013-03-21
|\ \ | |/ |/|
| * gpg_interface: allow to request status returnMichael J Gruber2013-02-14
| * Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-14
| |\
* | \ Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-04
|\ \ \
| * | | Allow custom "comment char"Junio C Hamano2013-01-16
| |/ /
* | | Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Junio C Hamano2013-01-10
|\ \ \ | |/ / |/| / | |/
| * merge --no-edit: do not credit people involved in the side branchJunio C Hamano2012-12-28
* | i18n: fmt-merge-msg: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
|/
* Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-06-12
|\
| * fmt-merge-msg: make attribution into comment linesJunio C Hamano2012-06-06
* | Merge branch 'jk/ident-gecos-strbuf'Junio C Hamano2012-05-29
|\ \
| * | fmt-merge-msg: don't use static buffer in record_personJeff King2012-05-22
* | | Sync with 1.7.10.3Junio C Hamano2012-05-25
|\ \ \ | |/ / |/| |
| * | fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds2012-05-25
* | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-27
|\ \ \ | |/ / | | / | |/ |/|
| * fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-18
* | fmt-merge-msg: show those involved in a merged seriesJunio C Hamano2012-03-13
|/
* Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-13
* Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-09
|\
| * Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-05
* | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-09
|\ \
| * | fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano2011-11-08
| * | fmt-merge-msg: package options into a structureJunio C Hamano2011-11-07
| * | fmt-merge-msg: avoid early returnsJunio C Hamano2011-11-07
| |/
* | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-09
|\ \ | |/ |/|
| * fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse errorRamsay Jones2011-10-15
| * fmt-merge-msg: use branch.$name.descriptionJunio C Hamano2011-10-07
* | 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