summaryrefslogtreecommitdiffstats
path: root/builtin/diff.c
AgeCommit message (Expand)AuthorLines
2021-12-06diff: enable and test the sparse indexLessley Dennington-0/+5
2021-07-28Merge branch 'dl/diff-merge-base'Junio C Hamano-2/+2
2021-07-12git-diff: fix missing --merge-base docsDenton Liu-2/+2
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson-1/+1
2021-02-25Merge branch 'jc/diffcore-rotate'Junio C Hamano-0/+1
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano-0/+1
2021-02-12Merge branch 'tb/precompose-prefix-too'Junio C Hamano-1/+1
2021-02-05Merge branch 'so/log-diff-merge'Junio C Hamano-4/+5
2021-02-03MacOS: precompose_argv_prefix()Torsten Bögershausen-1/+1
2020-12-21diff-merges: new function diff_merges_set_dense_combined_if_unset()Sergey Organov-4/+5
2020-11-02Merge branch 'dl/diff-merge-base'Junio C Hamano-16/+33
2020-09-29diff: get rid of redundant 'dense' argumentSergey Organov-2/+1
2020-09-21builtin/diff-tree: learn --merge-baseDenton Liu-12/+27
2020-09-20builtin/diff-index: learn --merge-baseDenton Liu-0/+2
2020-09-20diff-lib: accept option flags in run_diff_index()Denton Liu-4/+4
2020-07-09Merge branch 'ct/diff-with-merge-base-clarification' into masterJunio C Hamano-1/+1
2020-07-08diff: check for merge bases before assigning sym->baseJeff King-1/+1
2020-06-29Merge branch 'dl/diff-usage-comment-update'Junio C Hamano-3/+12
2020-06-25Merge branch 'ct/diff-with-merge-base-clarification'Junio C Hamano-14/+118
2020-06-23builtin/diff: fix botched update of usage commentDenton Liu-4/+1
2020-06-18builtin/diff: update usage commentDenton Liu-3/+15
2020-06-12Documentation: usage for diff combined commitsChris Torek-1/+7
2020-06-12git diff: improve range handlingChris Torek-13/+111
2020-03-30oid_array: rename source file from sha1-arrayJeff King-1/+1
2019-04-25Merge branch 'nd/diff-parseopt-4'Junio C Hamano-19/+3
2019-03-24diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy-18/+3
2019-03-07Merge branch 'jk/diff-no-index-initialize'Junio C Hamano-9/+11
2019-02-24diff: reuse diff setup for --no-index caseJeff King-9/+11
2019-02-06Merge branch 'sl/const'Junio C Hamano-1/+1
2019-02-04various: tighten constness of some local variablesShahzad Lone-1/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy-0/+1
2019-01-14read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy-1/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano-2/+2
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-1/+1
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King-1/+1
2018-06-29tag: add repository argument to deref_tagStefan Beller-1/+1
2018-06-29tree: add repository argument to lookup_treeStefan Beller-1/+2
2018-06-29object: add repository argument to parse_objectStefan Beller-1/+1
2018-06-25Merge branch 'nd/diff-apply-ita'Junio C Hamano-0/+7
2018-05-29diff: turn --ita-invisible-in-index on by defaultNguyễn Thái Ngọc Duy-0/+7
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee-1/+1
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee-1/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano-4/+4
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano-4/+3
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams-4/+4
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams-3/+3
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams-1/+1
2017-10-07Merge branch 'ma/builtin-unleak'Junio C Hamano-0/+3