summaryrefslogtreecommitdiff
path: root/log-tree.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/unused-annotation'Junio C Hamano2022-09-141-1/+1
|\
| * git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason2022-09-011-1/+1
* | Merge branch 'jk/unused-annotation'Junio C Hamano2022-09-141-1/+2
|\ \ | |/
| * refs: mark unused each_ref_fn parametersJeff King2022-08-191-1/+2
* | Merge branch 'jk/unused-fixes'Junio C Hamano2022-08-291-3/+2
|\ \
| * | log-tree: drop unused commit param in remerge_diff()Jeff King2022-08-191-3/+2
| |/
* | log-tree: use ref_namespaces instead of if/else-ifDerrick Stolee2022-08-051-10/+16
* | refs: use ref_namespaces for replace refs baseDerrick Stolee2022-08-051-0/+1
|/
* 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 'jc/diff-tree-stdin-fix'Junio C Hamano2022-04-281-0/+1
|\ \ \
| * | | 2.36 gitk/diff-tree --stdin regression fixJunio C Hamano2022-04-261-0/+1
* | | | Merge branch 'ab/object-file-api-updates'Junio C Hamano2022-03-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | object-file API: have hash_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason2022-02-251-1/+1
| |/ /
* | | show, log: include conflict/warning messages in --remerge-diff headersElijah Newren2022-02-021-0/+51
* | | diff: add ability to insert additional headers for pathsElijah Newren2022-02-021-1/+1
* | | log: clean unneeded objects during `log --remerge-diff`Elijah Newren2022-02-021-1/+7
* | | show, log: provide a --remerge-diff capabilityElijah Newren2022-02-021-0/+59
|/ /
* | ssh signing: make git log verify key lifetimeFabian Stelzer2021-12-091-0/+2
* | ssh signing: use sigc struct to pass payloadFabian Stelzer2021-12-091-4/+4
|/
* Merge branch 'fs/ssh-signing'Junio C Hamano2021-10-251-4/+4
|\
| * ssh signing: preliminary refactoring and clean-upFabian Stelzer2021-09-101-4/+4
* | load_ref_decorations(): fix decoration with tagsJeff King2021-07-141-2/+2
* | add_ref_decoration(): rename s/type/deco_type/Jeff King2021-06-281-7/+7
* | load_ref_decorations(): avoid parsing non-tag objectsJeff King2021-06-281-2/+4
|/
* hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
* format-patch: allow a non-integral version numbersZheNing Hu2021-03-231-2/+8
* Merge branch 'ab/diff-deferred-free'Junio C Hamano2021-02-221-4/+6
|\
| * diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason2021-02-111-4/+6
* | Merge branch 'bc/signed-objects-with-both-hashes'Junio C Hamano2021-02-221-7/+8
|\ \
| * | gpg-interface: improve interface for parsing tagsbrian m. carlson2021-02-101-6/+7
| * | commit: ignore additional signatures when parsing signed commitsbrian m. carlson2021-01-181-1/+1
* | | Merge branch 'js/range-diff-one-side-only'Junio C Hamano2021-02-171-2/+6
|\ \ \ | |_|/ |/| |
| * | range-diff: combine all options in a single data structureJohannes Schindelin2021-02-061-2/+6
| |/
* | Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-051-12/+18
|\ \ | |/ |/|
| * diff-merges: let new options enable diff without -pSergey Organov2020-12-211-4/+9
| * diff-merges: split 'ignore_merges' fieldSergey Organov2020-12-211-7/+8
| * diff-merges: introduce revs->first_parent_merges flagSergey Organov2020-12-211-2/+2
* | format-patch: make output filename configurableJunio C Hamano2020-11-091-1/+1
|/
* Merge branch 'so/combine-diff-simplify'Junio C Hamano2020-10-051-1/+1
|\
| * diff: get rid of redundant 'dense' argumentSergey Organov2020-09-291-1/+1
* | Merge branch 'es/format-patch-interdiff-cleanup'Junio C Hamano2020-09-221-2/+2
|\ \
| * | diff-lib: tighten show_interdiff()'s interfaceEric Sunshine2020-09-081-1/+2
| * | diff: move show_interdiff() from its own file to diff-libEric Sunshine2020-09-081-1/+0
| |/
* | log_tree_diff: get rid of extra check for NULLSergey Organov2020-09-061-1/+1
* | log_tree_diff: get rid of code duplication for first_parent_onlySergey Organov2020-09-061-15/+4
|/
* Merge branch 'ds/log-exclude-decoration-config'Junio C Hamano2020-04-281-3/+54
|\
| * log: add log.excludeDecoration config optionDerrick Stolee2020-04-161-7/+15
| * log-tree: make ref_filter_match() a helper methodDerrick Stolee2020-04-161-3/+46