]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c71930 4c25356)
Merge branch 'ab/retire-option-argument' into da/difftool
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 18:42:34 +0000 (11:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 18:42:34 +0000 (11:42 -0700)
commit93a8ed28ea29fe1b5691e3e3d93a1870df717ac0
treea8269751121fb4bba06d95cc1b30e9588bdfd3actree | snapshot
parent4c719308ce59dc70e606f910f40801f2c6051b24commit | diff
parent4c25356e0edaa92e21aadb67579a0263019fbdc4commit | diff
Merge branch 'ab/retire-option-argument' into da/difftool

* ab/retire-option-argument:
  parse-options API: remove OPTION_ARGUMENT feature
  difftool: use run_command() API in run_file_diff()
  difftool: prepare "diff" cmdline in cmd_difftool()
  difftool: prepare "struct child_process" in cmd_difftool()
Unnamed repository; edit this file 'description' to name the repository.