]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ab/retire-option-argument'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 20:44:48 +0000 (13:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 20:44:48 +0000 (13:44 -0700)
commit0e35107e7dde88a8d53a98773afbbbd23cd694ae
tree87d23d4283a3e80eb79ac62e09067607eeeea17e
parent0a4cb1f1f2f64e5f3791809284ba786a8094dfb4
parent4c25356e0edaa92e21aadb67579a0263019fbdc4
Merge branch 'ab/retire-option-argument'

An oddball OPTION_ARGUMENT feature has been removed from the
parse-options API.

* 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()