summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-04i18n: factorize more 'incompatible options' messagesLibravatar Jean-Noël Avila1-2/+3
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Libravatar Jean-Noël Avila1-1/+1
2022-01-05i18n: refactor "%s, %s and %s are mutually exclusive"Libravatar Jean-Noël Avila1-1/+1
2021-11-25difftool: use "env_array" to simplify memory managementLibravatar Ævar Arnfjörð Bjarmason1-10/+4
2021-10-11Merge branch 'da/difftool'Libravatar Junio C Hamano1-51/+53
2021-10-03Merge branch 'bs/difftool-msg-tweak'Libravatar Junio C Hamano1-3/+3
2021-10-03Merge branch 'da/difftool-dir-diff-symlink-fix'Libravatar Junio C Hamano1-0/+2
2021-09-30difftool: add a missing space to the run_dir_diff() commentsLibravatar David Aguilar1-1/+1
2021-09-30difftool: remove an unnecessary call to strbuf_release()Libravatar David Aguilar1-2/+0
2021-09-30difftool: refactor dir-diff to write files using helper functionsLibravatar David Aguilar1-22/+28
2021-09-30difftool: create a tmpdir path without repeated slashesLibravatar David Aguilar1-26/+24
2021-09-23Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolLibravatar Junio C Hamano1-0/+2
2021-09-23difftool: fix symlink-file writing in dir-diff modeLibravatar David Aguilar1-0/+2
2021-09-22difftool: fix word spacing in the usage stringsLibravatar Bagas Sanjaya1-3/+3
2021-09-12parse-options API: remove OPTION_ARGUMENT featureLibravatar Ævar Arnfjörð Bjarmason1-1/+3
2021-09-12difftool: use run_command() API in run_file_diff()Libravatar Ævar Arnfjörð Bjarmason1-7/+6
2021-09-12difftool: prepare "diff" cmdline in cmd_difftool()Libravatar Jeff King1-8/+7
2021-09-12difftool: prepare "struct child_process" in cmd_difftool()Libravatar Ævar Arnfjörð Bjarmason1-14/+15
2021-07-08Merge branch 'ab/cmd-foo-should-return'Libravatar Junio C Hamano1-3/+2
2021-06-09builtins + test helpers: use return instead of exit() in cmd_*Libravatar Ævar Arnfjörð Bjarmason1-3/+2
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 00:41:54 +0000