]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.