summaryrefslogtreecommitdiff
path: root/builtin/log.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano2022-06-071-12/+24
|\
| * revisions API users: use release_revisions() in builtin/log.cÆvar Arnfjörð Bjarmason2022-04-131-8/+12
| * format-patch: don't leak "extra_headers" or "ref_message_ids"Ævar Arnfjörð Bjarmason2022-04-131-1/+6
| * string_list API users: use string_list_init_{no,}dupÆvar Arnfjörð Bjarmason2022-04-131-3/+6
* | Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-201-1/+1
|\ \
| * \ Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-021-1/+1
| |\ \
| | * | tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-1/+1
* | | | Merge branch 'ds/sparse-colon-path'Junio C Hamano2022-05-201-0/+5
|\ \ \ \
| * | | | show: integrate with the sparse indexDerrick Stolee2022-04-261-0/+5
| | |_|/ | |/| |
* | | | Merge branch 'rs/format-patch-pathspec-fix'Junio C Hamano2022-05-041-7/+2
|\ \ \ \
| * | | | 2.36 format-patch regression fixRené Scharfe2022-04-301-7/+2
| |/ / /
* | | | 2.36 show regression fixJunio C Hamano2022-04-291-5/+18
|/ / /
* | | Merge branch 'ab/grep-patterntype'Junio C Hamano2022-02-251-2/+11
|\ \ \
| * | | grep API: call grep_config() after grep_init()Ævar Arnfjörð Bjarmason2022-02-151-2/+11
| |/ /
* | | Merge branch 'ja/i18n-common-messages'Junio C Hamano2022-02-251-2/+3
|\ \ \
| * | | i18n: factorize more 'incompatible options' messagesJean-Noël Avila2022-02-041-2/+3
| |/ /
* | | Merge branch 'en/remerge-diff'Junio C Hamano2022-02-161-0/+15
|\ \ \ | |/ / |/| |
| * | log: clean unneeded objects during `log --remerge-diff`Elijah Newren2022-02-021-6/+7
| * | show, log: provide a --remerge-diff capabilityElijah Newren2022-02-021-0/+14
* | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-4/+4
|\ \ \
| * | | i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila2022-01-051-1/+1
| * | | i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila2022-01-051-1/+1
| * | | i18n: refactor "foo and bar are mutually exclusive"Jean-Noël Avila2022-01-051-2/+2
| |/ /
* | | Merge branch 'jc/unleak-log'Junio C Hamano2022-01-031-0/+1
|\ \ \ | |/ / |/| |
| * | format-patch: mark rev_info with UNLEAKJunio C Hamano2021-12-161-0/+1
| |/
* | log: load decorations with --simplify-by-decorationJeff King2021-12-011-2/+3
* | log: handle --decorate-refs with userformat "%d"Jeff King2021-12-011-2/+16
|/
* revision: separate walk and unsorted flagsPatrick Steinhardt2021-08-051-1/+1
* Merge branch 'jk/log-decorate-optim'Junio C Hamano2021-07-281-0/+3
|\
| * log: avoid loading decorations for userformats that don't need itJeff King2021-06-281-0/+3
* | *: fix typos which duplicate a wordAndrei Rybak2021-06-141-2/+1
|/
* Merge branch 'so/log-diff-merge'Junio C Hamano2021-04-301-0/+2
|\
| * diff-merges: introduce log.diffMerges config variableSergey Organov2021-04-161-0/+2
* | Merge branch 'zh/format-patch-fractional-reroll-count'Junio C Hamano2021-04-021-9/+16
|\ \
| * | format-patch: allow a non-integral version numbersZheNing Hu2021-03-231-9/+16
| |/
* | tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason2021-03-201-4/+4
|/
* Merge branch 'ab/diff-deferred-free'Junio C Hamano2021-02-221-11/+12
|\
| * diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason2021-02-111-11/+12
* | Merge branch 'js/range-diff-one-side-only'Junio C Hamano2021-02-171-2/+8
|\ \
| * | range-diff: combine all options in a single data structureJohannes Schindelin2021-02-061-2/+8
* | | Merge branch 'js/range-diff-wo-dotdot'Junio C Hamano2021-02-171-1/+1
|\ \ \ | |_|/ |/| |
| * | range-diff/format-patch: refactor check for commit rangeJohannes Schindelin2021-01-271-1/+1
| |/
* | Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-051-15/+7
|\ \
| * | diff-merges: handle imply -p on -c/--cc logic for log.cSergey Organov2020-12-211-4/+0
| * | diff-merges: rename diff_merges_default_to_enable() to match semanticsSergey Organov2020-12-211-2/+2
| * | diff-merges: move checks for first_parent_only out of the moduleSergey Organov2020-12-211-2/+6
| * | diff-merges: rename all functions to have common prefixSergey Organov2020-12-211-2/+2
| * | revision: move diff merges functions to its own diff-merges.cSergey Organov2020-12-211-0/+1
| * | revision: provide implementation for diff merges tweaksSergey Organov2020-12-211-11/+2
* | | Merge branch 'ab/mailmap'Junio C Hamano2021-01-251-1/+1
|\ \ \ | |_|/ |/| |