summaryrefslogtreecommitdiffstats
path: root/builtin/log.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-041-0/+1
|\ \ | |/ |/|
| * format-patch: mark rev_info with UNLEAKJunio C Hamano2021-12-171-0/+1
* | log: load decorations with --simplify-by-decorationJeff King2021-12-021-2/+3
* | log: handle --decorate-refs with userformat "%d"Jeff King2021-12-021-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-291-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-171-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-211-4/+4
|/
* Merge branch 'ab/diff-deferred-free'Junio C Hamano2021-02-231-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-181-2/+8
|\ \
| * | range-diff: combine all options in a single data structureJohannes Schindelin2021-02-071-2/+8
* | | Merge branch 'js/range-diff-wo-dotdot'Junio C Hamano2021-02-181-1/+1
|\ \ \ | |_|/ |/| |
| * | range-diff/format-patch: refactor check for commit rangeJohannes Schindelin2021-01-281-1/+1
| |/
* | Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-061-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
|\ \ \ | |_|/ |/| |
| * | shortlog: remove unused(?) "repo-abbrev" featureÆvar Arnfjörð Bjarmason2021-01-121-1/+1
* | | builtin/*: update usage formatZheNing Hu2021-01-071-4/+4
|/ /
* | Merge branch 'ma/grep-init-default'Junio C Hamano2020-12-091-1/+0
|\ \
| * | grep: use designated initializers for `grep_defaults`Martin Ågren2020-11-211-1/+0
| * | grep: don't set up a "default" repo for grepMartin Ågren2020-11-211-1/+1
* | | Merge branch 'jc/format-patch-name-max'Junio C Hamano2020-11-221-6/+14
|\ \ \ | |/ / |/| |
| * | format-patch: make output filename configurableJunio C Hamano2020-11-101-6/+14
| |/
* | Merge branch 'pb/blame-funcname-range-userdiff'Junio C Hamano2020-11-181-2/+2
|\ \
| * | line-log: mention both modes in 'blame' and 'log' short helpPhilippe Blain2020-11-021-2/+2
| |/
* | Merge branch 'jk/format-patch-output'Junio C Hamano2020-11-181-15/+22
|\ \
| * | format-patch: support --output optionJeff King2020-11-041-2/+9
| * | format-patch: tie file-opening logic to output_directoryJeff King2020-11-041-6/+6
| * | format-patch: refactor output selectionJeff King2020-11-041-9/+9
| |/
* | Merge branch 'jc/line-log-takes-no-pathspec'Junio C Hamano2020-11-181-0/+3
|\ \
| * | log: diagnose -L used with pathspec as an errorJunio C Hamano2020-11-041-0/+3
| |/
* / Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
|/
* Merge branch 'jk/format-auto-base-when-able'Junio C Hamano2020-10-051-25/+105
|\
| * format-patch: teach format.useAutoBase "whenAble" optionJacob Keller2020-10-021-25/+105
* | Merge branch 'jk/shortlog-group-by-trailer'Junio C Hamano2020-10-041-0/+1
|\ \ | |/ |/|