summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* diff.h: move pickaxe fields together againÆvar Arnfjörð Bjarmason2021-05-111-2/+1
* pickaxe: die when --find-object and --pickaxe-all are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+2
* pickaxe: die when -G and --pickaxe-regex are combinedÆvar Arnfjörð Bjarmason2021-05-111-0/+2
* Merge branch 'jc/diffcore-rotate'Junio C Hamano2021-02-251-0/+21
|\
| * diff: --{rotate,skip}-to=<path>Junio C Hamano2021-02-161-0/+21
* | diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason2021-02-111-1/+14
|/
* Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano2021-01-251-0/+1
|\
| * diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain2020-12-081-0/+1
* | Merge branch 'mk/diff-ignore-regex'Junio C Hamano2020-11-021-0/+4
|\ \
| * | diff: add -I<regex> that ignores matching changesMichał Kępień2020-10-201-0/+4
* | | Merge branch 'dl/diff-merge-base'Junio C Hamano2020-11-021-1/+6
|\ \ \ | |_|/ |/| |
| * | builtin/diff-index: learn --merge-baseDenton Liu2020-09-201-0/+1
| * | diff-lib: define diff_get_merge_base()Denton Liu2020-09-201-0/+2
| * | diff-lib: accept option flags in run_diff_index()Denton Liu2020-09-201-1/+3
* | | Merge branch 'so/combine-diff-simplify'Junio C Hamano2020-10-051-3/+3
|\ \ \
| * | | diff: get rid of redundant 'dense' argumentSergey Organov2020-09-291-3/+3
| | |/ | |/|
* | | Merge branch 'tb/bloom-improvements'Junio C Hamano2020-09-291-2/+0
|\ \ \
| * | | bloom/diff: properly short-circuit on max_changesDerrick Stolee2020-09-171-2/+0
| | |/ | |/|
* | | diff-lib: tighten show_interdiff()'s interfaceEric Sunshine2020-09-081-1/+6
* | | diff: move show_interdiff() from its own file to diff-libEric Sunshine2020-09-081-0/+2
|/ /
* | diff.h: drop diff_tree_oid() & friends' return valueSZEDER Gábor2020-06-081-5/+5
|/
* diff: halt tree-diff early after max_changesDerrick Stolee2020-03-301-0/+5
* Merge branch 'hw/doc-in-header'Junio C Hamano2019-12-161-0/+126
|\
| * diff: move doc to diff.h and diffcore.hHeba Waly2019-11-181-0/+126
* | diff: export diffstat interfaceDaniel Ferreira2019-11-141-0/+20
|/
* patch-id: convert to use the_hash_algobrian m. carlson2019-08-191-1/+1
* range-diff: suppress line count in outer diffThomas Gummerer2019-07-111-0/+1
* Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano2019-06-131-1/+2
|\
| * format-patch: make --base patch-id output stableStephen Boyd2019-05-081-1/+2
* | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-05-301-1/+1
|\ \ | |/ |/|
| * diff-parseopt: correct variable types that are used by parseoptNguyễn Thái Ngọc Duy2019-05-291-1/+1
* | Merge branch 'nd/diff-parseopt-4'Junio C Hamano2019-04-251-1/+4
|\ \
| * | am: avoid diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-0/+2
| * | diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-1/+2
| |/
* | Merge branch 'jk/diff-no-index-initialize'Junio C Hamano2019-03-071-1/+1
|\ \
| * | diff: reuse diff setup for --no-index caseJeff King2019-02-241-1/+1
* | | Merge branch 'jk/unused-params'Junio C Hamano2019-03-071-1/+1
|\ \ \
| * | | diff: drop options parameter from diffcore_fix_diff_index()Jeff King2019-02-141-1/+1
* | | | Merge branch 'en/combined-all-paths'Junio C Hamano2019-03-071-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | log,diff-tree: add --combined-all-paths optionElijah Newren2019-02-071-0/+1
| |/ /
* | | diff.c: prepare to use parse_options() for parsingNguyễn Thái Ngọc Duy2019-01-271-0/+2
* | | diff.h: avoid bit fields in struct diff_flagsNguyễn Thái Ngọc Duy2019-01-271-33/+33
* | | diff.h: keep forward struct declarations sortedNguyễn Thái Ngọc Duy2019-01-271-6/+6
|/ /
* | Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano2019-01-141-1/+2
|\ \
| * | diff: align move detection error handling with other optionsStefan Beller2018-11-141-1/+2
| |/
* | notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+2
|/
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-5/+17
|\
| * userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+5
View Lorry Controller Status