summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/parallel-checkout-part-3'Junio C Hamano2021-05-161-1/+1
|\
| * make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares2021-05-051-1/+1
* | Merge branch 'ds/sparse-index-protections'Junio C Hamano2021-04-301-0/+3
|\ \ | |/ |/|
| * difftool: ensure full indexDerrick Stolee2021-04-141-0/+3
* | entry: extract a header file for entry.c functionsMatheus Tavares2021-03-231-0/+1
|/
* Use new HASHMAP_INIT macro to simplify hashmap initializationElijah Newren2020-11-111-5/+4
* strvec: rename struct fieldsJeff King2020-07-301-1/+1
* strvec: fix indentation in renamed callsJeff King2020-07-281-6/+6
* strvec: convert builtin/ callers away from argv_array nameJeff King2020-07-281-7/+7
* strvec: rename files from argv-array to strvecJeff King2020-07-281-1/+1
* hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong2019-10-071-1/+1
* OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong2019-10-071-2/+2
* hashmap: use *_entry APIs for iterationEric Wong2019-10-071-4/+4
* hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-071-12/+19
* hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong2019-10-071-1/+1
* hashmap_get takes "const struct hashmap_entry *"Eric Wong2019-10-071-2/+3
* hashmap_add takes "struct hashmap_entry *"Eric Wong2019-10-071-3/+3
* hashmap_entry_init takes "struct hashmap_entry *"Eric Wong2019-10-071-3/+3
* Merge branch 'js/difftool-no-index'Junio C Hamano2019-05-191-1/+2
|\
| * difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin2019-05-091-1/+2
* | Merge branch 'dl/difftool-mergetool'Junio C Hamano2019-05-191-8/+5
|\ \
| * | difftool: fallback on merge.guitoolDenton Liu2019-05-131-8/+2
| * | difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu2019-05-131-0/+3
* | | Merge branch 'bc/hash-transition-16'Junio C Hamano2019-04-251-6/+4
|\ \ \ | |_|/ |/| |
| * | builtin/difftool: use parse_oid_hexbrian m. carlson2019-04-011-6/+4
* | | difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin2019-03-181-3/+10
* | | difftool: remove obsolete (and misleading) commentJohannes Schindelin2019-03-181-1/+0
|/ /
* | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-0/+1
|\ \
| * | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
| |/
* | checkout: print something when checking out pathsNguyễn Thái Ngọc Duy2018-11-141-1/+1
|/
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-1/+1
|\
| * sha1-file.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-2/+2
|/
* Merge branch 'rs/parse-opt-lithelp'Junio C Hamano2018-08-171-2/+2
|\
| * difftool: remove angular brackets from argument helpRené Scharfe2018-08-031-2/+2
* | Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-021-3/+3
|\ \
| * | block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-3/+3
| * | read-cache: teach make_cache_entry to take object_idJameson Miller2018-07-031-2/+2
* | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ \ | |/ / |/| |
| * | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | Merge branch 'nd/use-opt-int-set-f'Junio C Hamano2018-06-011-5/+4
|\ \ \
| * | | Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy2018-05-241-5/+4
* | | | Merge branch 'ma/lockfile-cleanup'Junio C Hamano2018-05-301-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | lock_file: make function-local locks non-staticMartin Ågren2018-05-101-1/+1
| | |/ | |/|
* | | exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
| |/ |/|
* | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
|/
* read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-071-1/+0
* sha1_file: convert index_fd to struct object_idPatryk Obara2017-08-201-1/+1
* builtin/difftool.c: drop hashmap_cmp_fn castStefan Beller2017-07-051-15/+22
* hashmap.h: compare function has access to a data fieldStefan Beller2017-06-301-9/+15
View Lorry Controller Status