summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
AgeCommit message (Expand)AuthorFilesLines
2021-05-16Merge branch 'mt/parallel-checkout-part-3'Libravatar Junio C Hamano1-1/+1
2021-05-05make_transient_cache_entry(): optionally alloc from mem_poolLibravatar Matheus Tavares1-1/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Libravatar Junio C Hamano1-0/+3
2021-04-14difftool: ensure full indexLibravatar Derrick Stolee1-0/+3
2021-03-23entry: extract a header file for entry.c functionsLibravatar Matheus Tavares1-0/+1
2020-11-11Use new HASHMAP_INIT macro to simplify hashmap initializationLibravatar Elijah Newren1-5/+4
2020-07-30strvec: rename struct fieldsLibravatar Jeff King1-1/+1
2020-07-28strvec: fix indentation in renamed callsLibravatar Jeff King1-6/+6
2020-07-28strvec: convert builtin/ callers away from argv_array nameLibravatar Jeff King1-7/+7
2020-07-28strvec: rename files from argv-array to strvecLibravatar Jeff King1-1/+1
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryLibravatar Eric Wong1-1/+1
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsLibravatar Eric Wong1-2/+2
2019-10-07hashmap: use *_entry APIs for iterationLibravatar Eric Wong1-4/+4
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsLibravatar Eric Wong1-12/+19
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Libravatar Eric Wong1-1/+1
2019-10-07hashmap_get takes "const struct hashmap_entry *"Libravatar Eric Wong1-2/+3
2019-10-07hashmap_add takes "struct hashmap_entry *"Libravatar Eric Wong1-3/+3
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Libravatar Eric Wong1-3/+3
2019-05-19Merge branch 'js/difftool-no-index'Libravatar Junio C Hamano1-1/+2
2019-05-19Merge branch 'dl/difftool-mergetool'Libravatar Junio C Hamano1-8/+5
2019-05-13difftool: fallback on merge.guitoolLibravatar Denton Liu1-8/+2
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveLibravatar Denton Liu1-0/+3
2019-05-09difftool --no-index: error out on --dir-diff (and don't crash)Libravatar Johannes Schindelin1-1/+2
2019-04-25Merge branch 'bc/hash-transition-16'Libravatar Junio C Hamano1-6/+4
2019-04-01builtin/difftool: use parse_oid_hexLibravatar brian m. carlson1-6/+4
2019-03-18difftool: allow running outside Git worktrees with --no-indexLibravatar Johannes Schindelin1-3/+10
2019-03-18difftool: remove obsolete (and misleading) commentLibravatar Johannes Schindelin1-1/+0
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-0/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-11-14checkout: print something when checking out pathsLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-1/+1
2018-09-21sha1-file.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-2/+2
2018-08-17Merge branch 'rs/parse-opt-lithelp'Libravatar Junio C Hamano1-2/+2
2018-08-03difftool: remove angular brackets from argument helpLibravatar René Scharfe1-2/+2
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Libravatar Junio C Hamano1-3/+3
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-0/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsLibravatar Jameson Miller1-3/+3
2018-07-03read-cache: teach make_cache_entry to take object_idLibravatar Jameson Miller1-2/+2
2018-06-01Merge branch 'nd/use-opt-int-set-f'Libravatar Junio C Hamano1-5/+4
2018-05-30Merge branch 'ma/lockfile-cleanup'Libravatar Junio C Hamano1-1/+1
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationLibravatar Nguyễn Thái Ngọc Duy1-5/+4
2018-05-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
2018-05-10lock_file: make function-local locks non-staticLibravatar Martin Ågren1-1/+1
2018-04-11exec_cmd: rename to use dash in file nameLibravatar Stefan Beller1-1/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Libravatar Martin Ågren1-1/+0
2017-08-20sha1_file: convert index_fd to struct object_idLibravatar Patryk Obara1-1/+1
2017-07-05builtin/difftool.c: drop hashmap_cmp_fn castLibravatar Stefan Beller1-15/+22
2017-06-30hashmap.h: compare function has access to a data fieldLibravatar Stefan Beller1-9/+15
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 08:21:14 +0000