summaryrefslogtreecommitdiff
path: root/builtin/diff.c
Commit message (Expand)AuthorAgeFilesLines
* cache.h: remove this no-longer-used headerElijah Newren2023-05-161-2/+1
* read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-05-161-0/+1
* preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren2023-05-161-0/+1
* Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-pa...Junio C Hamano2023-05-081-0/+1
|\
| * commit.h: reduce unnecessary includesElijah Newren2023-04-241-0/+1
| * Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-1/+2
| |\
* | \ Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+2
|\ \ \ | |/ /
| * | setup.h: move declarations for setup.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-1/+2
|\ \ \ | | |/ | |/|
| * | cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| |/
* | mark "argv" as unused when we check argcJeff King2023-03-281-3/+3
|/
* Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-1/+1
|\
| * built-ins: use free() not UNLEAK() if trivial, rm dead codeÆvar Arnfjörð Bjarmason2022-11-211-1/+1
* | cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason2022-11-211-11/+14
|/
* Merge branch 'ab/doc-synopsis-and-cmd-usage'Junio C Hamano2022-10-281-1/+2
|\
| * built-ins: consistently add "\n" between "usage" and optionsÆvar Arnfjörð Bjarmason2022-10-131-1/+2
* | diff: support ^! for mergesRené Scharfe2022-10-011-5/+18
|/
* Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano2022-06-071-1/+1
|\
| * revisions API: call diff_free(&revs->pruning) in revisions_release()Ævar Arnfjörð Bjarmason2022-04-131-1/+0
| * revisions API users: use release_revisions() with UNLEAK()Ævar Arnfjörð Bjarmason2022-04-131-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
* | | builtin/diff.c: fix "git-diff" usage string typoShaoxuan Yuan2022-02-021-3/+3
|/ /
* | diff: enable and test the sparse indexLessley Dennington2021-12-061-0/+5
|/
* Merge branch 'dl/diff-merge-base'Junio C Hamano2021-07-281-2/+2
|\
| * git-diff: fix missing --merge-base docsDenton Liu2021-07-121-2/+2
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
* | Merge branch 'jc/diffcore-rotate'Junio C Hamano2021-02-251-0/+1
|\ \
| * | diff: --{rotate,skip}-to=<path>Junio C Hamano2021-02-161-0/+1
* | | Merge branch 'tb/precompose-prefix-too'Junio C Hamano2021-02-121-1/+1
|\ \ \ | |/ / |/| |
| * | MacOS: precompose_argv_prefix()Torsten Bögershausen2021-02-031-1/+1
* | | Merge branch 'so/log-diff-merge'Junio C Hamano2021-02-051-4/+5
|\ \ \ | |/ / |/| |
| * | diff-merges: new function diff_merges_set_dense_combined_if_unset()Sergey Organov2020-12-211-4/+5
* | | Merge branch 'dl/diff-merge-base'Junio C Hamano2020-11-021-16/+33
|\ \ \ | |/ / |/| / | |/
| * builtin/diff-tree: learn --merge-baseDenton Liu2020-09-211-12/+27
| * builtin/diff-index: learn --merge-baseDenton Liu2020-09-201-0/+2
| * diff-lib: accept option flags in run_diff_index()Denton Liu2020-09-201-4/+4
* | diff: get rid of redundant 'dense' argumentSergey Organov2020-09-291-2/+1
|/
* Merge branch 'ct/diff-with-merge-base-clarification' into masterJunio C Hamano2020-07-091-1/+1
|\
| * diff: check for merge bases before assigning sym->baseJeff King2020-07-081-1/+1
* | Merge branch 'dl/diff-usage-comment-update'Junio C Hamano2020-06-291-3/+12
|\ \
| * | builtin/diff: fix botched update of usage commentDenton Liu2020-06-231-4/+1
| * | builtin/diff: update usage commentDenton Liu2020-06-181-3/+15
* | | Merge branch 'ct/diff-with-merge-base-clarification'Junio C Hamano2020-06-251-14/+118
|\ \ \ | | |/ | |/|
| * | Documentation: usage for diff combined commitsChris Torek2020-06-121-1/+7
| * | git diff: improve range handlingChris Torek2020-06-121-13/+111
| |/
* | oid_array: rename source file from sha1-arrayJeff King2020-03-301-1/+1
|/
* Merge branch 'nd/diff-parseopt-4'Junio C Hamano2019-04-251-19/+3
|\
View Lorry Controller Status