summaryrefslogtreecommitdiff
path: root/builtin/diff.c
AgeCommit message (Expand)AuthorFilesLines
2021-02-05Merge branch 'so/log-diff-merge'Libravatar Junio C Hamano1-4/+5
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Libravatar Sergey Organov1-4/+5
2020-11-02Merge branch 'dl/diff-merge-base'Libravatar Junio C Hamano1-16/+33
2020-09-29diff: get rid of redundant 'dense' argumentLibravatar Sergey Organov1-2/+1
2020-09-21builtin/diff-tree: learn --merge-baseLibravatar Denton Liu1-12/+27
2020-09-20builtin/diff-index: learn --merge-baseLibravatar Denton Liu1-0/+2
2020-09-20diff-lib: accept option flags in run_diff_index()Libravatar Denton Liu1-4/+4
2020-07-09Merge branch 'ct/diff-with-merge-base-clarification' into masterLibravatar Junio C Hamano1-1/+1
2020-07-08diff: check for merge bases before assigning sym->baseLibravatar Jeff King1-1/+1
2020-06-29Merge branch 'dl/diff-usage-comment-update'Libravatar Junio C Hamano1-3/+12
2020-06-25Merge branch 'ct/diff-with-merge-base-clarification'Libravatar Junio C Hamano1-14/+118
2020-06-23builtin/diff: fix botched update of usage commentLibravatar Denton Liu1-4/+1
2020-06-18builtin/diff: update usage commentLibravatar Denton Liu1-3/+15
2020-06-12Documentation: usage for diff combined commitsLibravatar Chris Torek1-1/+7
2020-06-12git diff: improve range handlingLibravatar Chris Torek1-13/+111
2020-03-30oid_array: rename source file from sha1-arrayLibravatar Jeff King1-1/+1
2019-04-25Merge branch 'nd/diff-parseopt-4'Libravatar Junio C Hamano1-19/+3
2019-03-24diff --no-index: use parse_options() instead of diff_opt_parse()Libravatar Nguyễn Thái Ngọc Duy1-18/+3
2019-03-07Merge branch 'jk/diff-no-index-initialize'Libravatar Junio C Hamano1-9/+11
2019-02-24diff: reuse diff setup for --no-index caseLibravatar Jeff King1-9/+11
2019-02-06Merge branch 'sl/const'Libravatar Junio C Hamano1-1/+1
2019-02-04various: tighten constness of some local variablesLibravatar Shahzad Lone1-1/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2019-01-14read-cache.c: replace update_index_if_able with repo_&Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-2/+2
2018-09-21revision.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-21diff.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King1-1/+1
2018-06-29tag: add repository argument to deref_tagLibravatar Stefan Beller1-1/+1
2018-06-29tree: add repository argument to lookup_treeLibravatar Stefan Beller1-1/+2
2018-06-29object: add repository argument to parse_objectLibravatar Stefan Beller1-1/+1
2018-06-25Merge branch 'nd/diff-apply-ita'Libravatar Junio C Hamano1-0/+7
2018-05-29diff: turn --ita-invisible-in-index on by defaultLibravatar Nguyễn Thái Ngọc Duy1-0/+7
2018-04-11treewide: replace maybe_tree with accessor methodsLibravatar Derrick Stolee1-1/+1
2018-04-11treewide: rename tree to maybe_treeLibravatar Derrick Stolee1-1/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionLibravatar brian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-4/+4
2017-11-06Merge branch 'ma/lockfile-fixes'Libravatar Junio C Hamano1-4/+3
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-4/+4
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-3/+3
2017-11-01diff: remove DIFF_OPT_TST macroLibravatar Brandon Williams1-1/+1
2017-10-07Merge branch 'ma/builtin-unleak'Libravatar Junio C Hamano1-0/+3
2017-10-06treewide: prefer lockfiles on the stackLibravatar Martin Ågren1-4/+3
2017-10-02builtin/: add UNLEAKsLibravatar Martin Ågren1-0/+3
2017-08-03submodule: remove gitmodules_configLibravatar Brandon Williams1-2/+0
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Libravatar Junio C Hamano1-4/+4
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idLibravatar Brandon Williams1-1/+1
2017-06-02Merge branch 'jk/diff-blob'Libravatar Junio C Hamano1-31/+29