path: root/builtin/difftool.c
AgeCommit message (Expand)Author
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
2017-07-05builtin/difftool.c: drop hashmap_cmp_fn castStefan Beller
2017-06-30hashmap.h: compare function has access to a data fieldStefan Beller
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-05-08difftool: address a couple of resource/memory leaksJohannes Schindelin
2017-04-14difftool: fix use-after-freeJohannes Schindelin
2017-03-30difftool: avoid strcpyJeff King
2017-03-15difftool: handle modified symlinks in dir-diff modeDavid Aguilar
2017-02-06difftool: fix bug when printing usageDavid Aguilar
2017-01-25difftool: hack around -Wzero-length-format warningJeff King
2017-01-19difftool: retire the scripted versionJohannes Schindelin
2017-01-19difftool: implement the functionality in the builtinJohannes Schindelin
2017-01-17difftool: add a skeleton for the upcoming builtinJohannes Schindelin