summaryrefslogtreecommitdiff
path: root/builtin/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * diff --no-index: use parse_options() instead of diff_opt_parse()Nguyễn Thái Ngọc Duy2019-03-241-18/+3
* | Merge branch 'jk/diff-no-index-initialize'Junio C Hamano2019-03-071-9/+11
|\ \
| * | diff: reuse diff setup for --no-index caseJeff King2019-02-241-9/+11
| |/
* | Merge branch 'sl/const'Junio C Hamano2019-02-061-1/+1
|\ \
| * | various: tighten constness of some local variablesShahzad Lone2019-02-041-1/+1
| |/
* | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
* | read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy2019-01-141-1/+1
|/
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-2/+2
|\
| * revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
|/
* tag: add repository argument to deref_tagStefan Beller2018-06-291-1/+1
* tree: add repository argument to lookup_treeStefan Beller2018-06-291-1/+2
* object: add repository argument to parse_objectStefan Beller2018-06-291-1/+1
* Merge branch 'nd/diff-apply-ita'Junio C Hamano2018-06-251-0/+7
|\
| * diff: turn --ita-invisible-in-index on by defaultNguyễn Thái Ngọc Duy2018-05-291-0/+7
* | treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-1/+1
* | treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-1/+1
|/
* Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-4/+4
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-4/+4
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-3/+3
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-1/+1
* | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-4/+3
|\ \ | |/ |/|
| * treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-4/+3
* | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-071-0/+3
|\ \ | |/ |/|
| * builtin/: add UNLEAKsma/builtin-unleakMartin Ågren2017-10-021-0/+3
* | submodule: remove gitmodules_configBrandon Williams2017-08-031-2/+0
|/
View Lorry Controller Status