summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
AgeCommit message (Expand)Author
2021-07-08Merge branch 'ab/cmd-foo-should-return'Junio C Hamano
2021-06-09builtins + test helpers: use return instead of exit() in cmd_*Ævar Arnfjörð Bjarmason
2021-05-16Merge branch 'mt/parallel-checkout-part-3'Junio C Hamano
2021-05-05make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano
2021-04-14difftool: ensure full indexDerrick Stolee
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares
2020-11-11Use new HASHMAP_INIT macro to simplify hashmap initializationElijah Newren
2020-07-31strvec: rename struct fieldsJeff King
2020-07-28strvec: fix indentation in renamed callsJeff King
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King
2020-07-28strvec: rename files from argv-array to strvecJeff King
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong
2019-10-07hashmap: use *_entry APIs for iterationEric Wong
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong
2019-10-07hashmap_get takes "const struct hashmap_entry *"Eric Wong
2019-10-07hashmap_add takes "struct hashmap_entry *"Eric Wong
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Eric Wong
2019-05-19Merge branch 'js/difftool-no-index'Junio C Hamano
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano
2019-05-13difftool: fallback on merge.guitoolDenton Liu
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu
2019-05-09difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin
2019-04-25Merge branch 'bc/hash-transition-16'Junio C Hamano
2019-04-01builtin/difftool: use parse_oid_hexbrian m. carlson
2019-03-18difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin
2019-03-18difftool: remove obsolete (and misleading) commentJohannes Schindelin
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2018-11-14checkout: print something when checking out pathsNguyễn Thái Ngọc Duy
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-08-17Merge branch 'rs/parse-opt-lithelp'Junio C Hamano
2018-08-03difftool: remove angular brackets from argument helpRené Scharfe
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller
2018-06-01Merge branch 'nd/use-opt-int-set-f'Junio C Hamano
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-05-10lock_file: make function-local locks non-staticMartin Ågren
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Martin Ågren
2017-08-21sha1_file: convert index_fd to struct object_idPatryk Obara
generated by cgit v0.10.2-6-g49f6 at 2024-04-20 04:18:58 (GMT)