summaryrefslogtreecommitdiffstats
path: root/builtin/difftool.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+5
|\
| * setup.h: move declarations for setup.c functions from cache.hElijah Newren2023-03-211-0/+1
| * environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
| * wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
| * abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
| * treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-1/+2
|\ \ | |/ |/|
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
|/
* treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason2023-01-171-1/+1
* cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason2023-01-161-1/+1
* builtin/difftool.c: { 0 }-initialize rather than using memset()Ævar Arnfjörð Bjarmason2023-01-131-3/+1
* {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason2022-11-211-1/+1
* replace and remove run_command_v_opt()René Scharfe2022-10-301-2/+5
* use child_process member "args" instead of string array variableRené Scharfe2022-10-301-8/+9
* Merge branch 'ab/unused-annotation'Junio C Hamano2022-09-141-5/+5
|\
| * git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason2022-09-011-5/+5
* | Merge branch 'jk/unused-annotation'Junio C Hamano2022-09-141-5/+5
|\|
| * hashmap: mark unused callback parametersJeff King2022-08-191-5/+5
* | parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor2022-08-191-1/+1
|/
* run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason2022-06-021-3/+3
* i18n: factorize more 'incompatible options' messagesJean-Noël Avila2022-02-041-2/+3
* i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-1/+1
* i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila2022-01-051-1/+1
* difftool: use "env_array" to simplify memory managementÆvar Arnfjörð Bjarmason2021-11-261-10/+4
* Merge branch 'da/difftool'Junio C Hamano2021-10-111-51/+53
|\
| * difftool: add a missing space to the run_dir_diff() commentsDavid Aguilar2021-10-011-1/+1
| * difftool: remove an unnecessary call to strbuf_release()David Aguilar2021-10-011-2/+0
| * difftool: refactor dir-diff to write files using helper functionsDavid Aguilar2021-10-011-22/+28
| * difftool: create a tmpdir path without repeated slashesDavid Aguilar2021-10-011-26/+24
| * Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano2021-09-231-0/+2
| |\
* | \ Merge branch 'bs/difftool-msg-tweak'Junio C Hamano2021-10-041-3/+3
|\ \ \
| * | | difftool: fix word spacing in the usage stringsBagas Sanjaya2021-09-231-3/+3
* | | | Merge branch 'da/difftool-dir-diff-symlink-fix'Junio C Hamano2021-10-041-0/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | difftool: fix symlink-file writing in dir-diff modeDavid Aguilar2021-09-231-0/+2
* | | parse-options API: remove OPTION_ARGUMENT featureÆvar Arnfjörð Bjarmason2021-09-131-1/+3
* | | difftool: use run_command() API in run_file_diff()Ævar Arnfjörð Bjarmason2021-09-131-7/+6
* | | difftool: prepare "diff" cmdline in cmd_difftool()Jeff King2021-09-131-8/+7
* | | difftool: prepare "struct child_process" in cmd_difftool()Ævar Arnfjörð Bjarmason2021-09-131-14/+15
| |/ |/|
* | Merge branch 'ab/cmd-foo-should-return'Junio C Hamano2021-07-081-3/+2
|\ \ | |/ |/|
| * builtins + test helpers: use return instead of exit() in cmd_*Ævar Arnfjörð Bjarmason2021-06-091-3/+2
* | 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-311-1/+1
* strvec: fix indentation in renamed callsJeff King2020-07-291-6/+6
* strvec: convert builtin/ callers away from argv_array nameJeff King2020-07-291-7/+7