summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
AgeCommit message (Expand)Author
12 daysi18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila
12 daysi18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila
2021-11-26difftool: use "env_array" to simplify memory managementÆvar Arnfjörð Bjarmason
2021-10-11Merge branch 'da/difftool'Junio C Hamano
2021-10-04Merge branch 'bs/difftool-msg-tweak'Junio C Hamano
2021-10-04Merge branch 'da/difftool-dir-diff-symlink-fix'Junio C Hamano
2021-10-01difftool: add a missing space to the run_dir_diff() commentsDavid Aguilar
2021-10-01difftool: remove an unnecessary call to strbuf_release()David Aguilar
2021-10-01difftool: refactor dir-diff to write files using helper functionsDavid Aguilar
2021-10-01difftool: create a tmpdir path without repeated slashesDavid Aguilar
2021-09-23Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano
2021-09-23difftool: fix symlink-file writing in dir-diff modeDavid Aguilar
2021-09-23difftool: fix word spacing in the usage stringsBagas Sanjaya
2021-09-13parse-options API: remove OPTION_ARGUMENT featureÆvar Arnfjörð Bjarmason
2021-09-13difftool: use run_command() API in run_file_diff()Ævar Arnfjörð Bjarmason
2021-09-13difftool: prepare "diff" cmdline in cmd_difftool()Jeff King
2021-09-13difftool: prepare "struct child_process" in cmd_difftool()Ævar Arnfjörð Bjarmason
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