summaryrefslogtreecommitdiffstats
path: root/builtin/log.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * shortlog: allow multiple groups to be specifiedJeff King2020-09-271-0/+1
* | Merge branch 'es/format-patch-interdiff-cleanup'Junio C Hamano2020-09-221-9/+13
|\ \
| * | format-patch: use 'origin' as start of current-series-range when knownEric Sunshine2020-09-091-7/+11
| * | diff-lib: tighten show_interdiff()'s interfaceEric Sunshine2020-09-091-1/+2
| * | diff: move show_interdiff() from its own file to diff-libEric Sunshine2020-09-091-1/+0
* | | Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano2020-09-091-1/+1
|\ \ \ | |/ / |/| |
| * | wt-status: tolerate dangling marksJonathan Tan2020-09-021-1/+1
| |/
* | Merge branch 'jk/log-fp-implies-m'Junio C Hamano2020-08-181-4/+3
|\ \
| * | log: enable "-m" automatically with "--first-parent"Jeff King2020-07-291-0/+3
| * | revision: add "--no-diff-merges" option to counteract "-m"Jeff King2020-07-291-2/+2
| * | log: drop "--cc implies -m" logicJeff King2020-07-291-4/+0
| |/
* / strvec: convert builtin/ callers away from argv_array nameJeff King2020-07-291-6/+6
|/
* Merge branch 'dl/opt-callback-cleanup'Junio C Hamano2020-05-051-28/+26
|\
| * Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-28/+26
* | Merge branch 'ds/log-exclude-decoration-config'Junio C Hamano2020-04-291-1/+15
|\ \
| * | log: add log.excludeDecoration config optionDerrick Stolee2020-04-161-1/+15
* | | Merge branch 'jc/log-no-mailmap'Junio C Hamano2020-04-291-0/+1
|\ \ \ | |_|/ |/| |
| * | log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmapJunio C Hamano2020-03-161-0/+1
| |/
* / format-patch: teach --no-encode-email-headersEmma Brooks2020-04-081-0/+7
|/
* Merge branch 'dl/format-patch-notes-config-fixup'Junio C Hamano2019-12-251-17/+14
|\
| * notes: break set_display_notes() into smaller functionsDenton Liu2019-12-131-1/+6
| * format-patch: move git_config() before repo_init_revisions()Denton Liu2019-12-091-4/+7
| * format-patch: use --notes behavior for format.notesDenton Liu2019-12-091-12/+1
| * notes: rename to load_display_notes()Denton Liu2019-12-091-2/+2
* | Merge branch 'dl/rebase-with-autobase'Junio C Hamano2019-12-161-3/+6
|\ \
| * | format-patch: teach --no-baseDenton Liu2019-12-051-2/+5
| * | format-patch: fix indentationDenton Liu2019-12-051-1/+1
* | | format-patch: pass notes configuration to range-diffDenton Liu2019-11-211-1/+23
* | | range-diff: pass through --notes to `git log`Denton Liu2019-11-211-1/+1
|/ /
* | Merge branch 'dl/format-patch-cover-from-desc'Junio C Hamano2019-11-101-33/+92
|\ \
| * | format-patch: teach --cover-from-description optionDenton Liu2019-10-161-20/+75
| * | format-patch: use enum variablesDenton Liu2019-10-161-13/+17
| * | format-patch: replace erroneous and conditionDenton Liu2019-10-161-1/+1