summaryrefslogtreecommitdiff
path: root/diff-lib.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dd/diff-files-unmerged-fix'Junio C Hamano2021-09-081-0/+4
|\
| * diff-lib: ignore paths that are outside $cwd if --relative askedĐoàn Trần Công Danh2021-08-251-0/+4
* | diff-lib: handle index diffs with sparse dirsDerrick Stolee2021-07-141-0/+19
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-3/+3
* | fsmonitor: add assertion that fsmonitor is valid to check_removedNipunn Koorapati2021-03-181-7/+11
* | fsmonitor: skip lstat deletion check during git diff-indexNipunn Koorapati2021-03-181-1/+4
|/
* Merge branch 'rs/plug-diff-cache-leak'Junio C Hamano2020-11-251-0/+2
|\
| * diff-lib: plug minor memory leaks in do_diff_cache()René Scharfe2020-11-161-0/+2
* | Merge branch 'nk/diff-files-vs-fsmonitor'Junio C Hamano2020-11-091-2/+13
|\ \
| * | fsmonitor: use fsmonitor data in `git diff`Alex Vandiver2020-10-201-2/+13
| |/
* | Merge branch 'dl/diff-merge-base'Junio C Hamano2020-11-021-2/+61
|\ \ | |/ |/|
| * builtin/diff-index: learn --merge-baseDenton Liu2020-09-201-1/+14
| * diff-lib: define diff_get_merge_base()Denton Liu2020-09-201-0/+45
| * diff-lib: accept option flags in run_diff_index()Denton Liu2020-09-201-1/+2
* | Merge branch 'so/combine-diff-simplify'Junio C Hamano2020-10-051-4/+2
|\ \
| * | diff: get rid of redundant 'dense' argumentSergey Organov2020-09-291-4/+2
* | | Merge branch 'es/format-patch-interdiff-cleanup'Junio C Hamano2020-09-221-0/+25
|\ \ \ | |_|/ |/| |
| * | diff-lib: tighten show_interdiff()'s interfaceEric Sunshine2020-09-081-3/+4
| * | diff: move show_interdiff() from its own file to diff-libEric Sunshine2020-09-081-0/+24
* | | revision: add separate field for "-m" of "diff-index -m"Sergey Organov2020-08-311-8/+2
|/ /
* | diff-lib: use worktree mode in diffs from i-t-a entriesRaymond E. Pasco2020-08-091-1/+2
|/
* diff-files --raw: show correct post-image of intent-to-add filesJohannes Schindelin2020-07-011-2/+1
* mark_fsmonitor_valid(): mark the index as changed if neededJohannes Schindelin2019-05-281-1/+1
* diff: drop options parameter from diffcore_fix_diff_index()Jeff King2019-02-141-1/+1
* diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-3/+4
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-9/+12
|\
| * revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
| * diff-lib.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-7/+10
* | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-2/+2
|\ \
| * | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-1/+1
| * | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
| |/
* | Merge branch 'nd/unpack-trees-with-cache-tree'Junio C Hamano2018-09-171-2/+2
|\ \ | |/ |/|
| * trace.h: support nested performance tracingNguyễn Thái Ngọc Duy2018-08-181-2/+2
* | dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy2018-08-131-2/+2
|/
* Merge branch 'jk/has-uncommitted-changes-fix'Junio C Hamano2018-08-021-0/+3
|\
| * has_uncommitted_changes(): fall back to empty treeJeff King2018-07-111-0/+3
* | diff: ignore --ita-[in]visible-in-index when diffing worktree-to-treeNguyễn Thái Ngọc Duy2018-05-291-2/+6
* | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-19/+19
|\ \
| * | diff-lib: rename 'new' variableBrandon Williams2018-02-221-19/+19
| |/
* | trace: measure where the time is spent in the index-heavy operationsnd/trace-index-opsNguyễn Thái Ngọc Duy2018-02-021-0/+4
|/
* Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-1/+1
|\
| * Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-0/+2
|\ \ | |/ |/|
| * fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-0/+2
* | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-14/+16
|\ \
| * | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-11/+11
| * | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-2/+2
| * | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-9/+10
| * | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-011-3/+4
* | | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-1/+1
View Lorry Controller Status