]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/config/interactive.txt
Merge branch 'pw/checkout-conflict-errorfix'
[thirdparty/git.git] / Documentation / config / interactive.txt
CommitLineData
630c2738
NTND
1interactive.singleKey::
2 In interactive commands, allow the user to provide one-letter
3 input with a single key (i.e., without hitting enter).
4 Currently this is used by the `--patch` mode of
46e91b66
NTND
5 linkgit:git-add[1], linkgit:git-checkout[1],
6 linkgit:git-restore[1], linkgit:git-commit[1],
64562d78 7 linkgit:git-reset[1], and linkgit:git-stash[1].
630c2738
NTND
8
9interactive.diffFilter::
10 When an interactive command (such as `git add --patch`) shows
11 a colorized diff, git will pipe the diff through the shell
12 command defined by this configuration variable. The command may
13 mark up the diff further for human consumption, provided that it
14 retains a one-to-one correspondence with the lines in the
15 original diff. Defaults to disabled (no filtering).