summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
Commit message (Expand)AuthorAgeFilesLines
* 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-251-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-09-301-1/+1
| * difftool: remove an unnecessary call to strbuf_release()David Aguilar2021-09-301-2/+0
| * difftool: refactor dir-diff to write files using helper functionsDavid Aguilar2021-09-301-22/+28
| * difftool: create a tmpdir path without repeated slashesDavid Aguilar2021-09-301-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-031-3/+3
|\ \ \
| * | | difftool: fix word spacing in the usage stringsBagas Sanjaya2021-09-221-3/+3
* | | | Merge branch 'da/difftool-dir-diff-symlink-fix'Junio C Hamano2021-10-031-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-121-1/+3
* | | difftool: use run_command() API in run_file_diff()Ævar Arnfjörð Bjarmason2021-09-121-7/+6
* | | difftool: prepare "diff" cmdline in cmd_difftool()Jeff King2021-09-121-8/+7
* | | difftool: prepare "struct child_process" in cmd_difftool()Ævar Arnfjörð Bjarmason2021-09-121-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-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
|\
View Lorry Controller Status