From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Feb 2020 22:34:58 +0000 (-0800)
Subject: Merge branch 'js/add-p-leftover-bits'
X-Git-Tag: v2.26.0-rc0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76c57fedfa8a15bd341c0059bff164a049fe1d5c;p=thirdparty%2Fgit.git

Merge branch 'js/add-p-leftover-bits'

The final leg of rewriting "add -i/-p" in C.

* js/add-p-leftover-bits:
  ci: include the built-in `git add -i` in the `linux-gcc` job
  built-in add -p: handle Escape sequences more efficiently
  built-in add -p: handle Escape sequences in interactive.singlekey mode
  built-in add -p: respect the `interactive.singlekey` config setting
  terminal: add a new function to read a single keystroke
  terminal: accommodate Git for Windows' default terminal
  terminal: make the code of disable_echo() reusable
  built-in add -p: handle diff.algorithm
  built-in add -p: support interactive.diffFilter
  t3701: adjust difffilter test
---

76c57fedfa8a15bd341c0059bff164a049fe1d5c