summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
Commit message (Expand)AuthorAgeFilesLines
* merge: allow to pretend a merge is made into a different branchJunio C Hamano2021-12-201-0/+4
* Lib-ify fmt-merge-msgDenton Liu2020-03-241-654/+1
* Merge branch 'hi/gpg-use-check-signature'Junio C Hamano2020-03-051-7/+4
|\
| * Revert "gpg-interface: prefer check_signature() for GPG verification"Junio C Hamano2020-02-281-7/+4
* | Merge branch 'hi/gpg-use-check-signature'Junio C Hamano2019-12-101-4/+7
|\ \ | |/
| * gpg-interface: prefer check_signature() for GPG verificationHans Jerry Illikainen2019-11-301-4/+7
* | fmt-merge-msg: use skip_prefix() instead of starts_with()René Scharfe2019-11-271-5/+4
|/
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-1/+1
|\
| * revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-3/+3
|\ \
| * | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-2/+2
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
| |/
* | Merge branch 'ds/reachable'Junio C Hamano2018-09-171-0/+1
|\ \ | |/ |/|
| * commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1
* | Merge branch 'nd/i18n'Junio C Hamano2018-08-151-1/+1
|\ \
| * | Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-1/+1
* | | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-3/+6
|\ \ \ | | |/ | |/|
| * | tag: add repository argument to deref_tagStefan Beller2018-06-291-1/+2
| * | commit: add repository argument to lookup_commitStefan Beller2018-06-291-1/+1
| * | object: add repository argument to parse_objectStefan Beller2018-06-291-2/+4
* | | Merge branch 'bc/object-id'Junio C Hamano2018-08-021-9/+10
|\ \ \ | |/ / |/| |
| * | builtin/fmt-merge-msg: make hash independentbrian m. carlson2018-07-161-9/+10
| |/
* | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
|/
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
* builtin/fmt-merge-msg: convert remaining code to object_idbrian m. carlson2018-03-141-2/+2
* Merge branch 'rs/fmt-merge-msg-string-leak-fix'Junio C Hamano2017-12-271-1/+2
|\
| * fmt-merge-msg: avoid leaking strbuf in shortlog()rs/fmt-merge-msg-string-leak-fixRené Scharfe2017-12-071-1/+2
* | Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano2017-11-151-1/+1
|\ \
| * | reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-081-1/+1
* | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-161-1/+1
|/ /
* | Merge branch 'dc/fmt-merge-msg-microcleanup'Junio C Hamano2017-08-111-1/+2
|\ \
| * | fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanupDimitrios Christidis2017-07-251-1/+2
| |/
* | 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
View Lorry Controller Status