diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 06:23:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 01:17:02 (GMT) |
| commit | 630c273846804c077b24db1ce57e890e26b810dc (patch) | |
| tree | 3615b4efbfe78088e0bfab6cda935223e8e4f585 /Documentation | |
| parent | cef9b95131cd52b9f04404698f062df2fd8d39f9 (diff) | |
| download | git-630c273846804c077b24db1ce57e890e26b810dc.zip git-630c273846804c077b24db1ce57e890e26b810dc.tar.gz git-630c273846804c077b24db1ce57e890e26b810dc.tar.bz2 | |
config.txt: move interactive.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 17 | ||||
| -rw-r--r-- | Documentation/config/interactive.txt | 16 |
2 files changed, 17 insertions, 16 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5b6e297..763bb29 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -361,22 +361,7 @@ include::config/init.txt[] include::config/instaweb.txt[] -interactive.singleKey:: - In interactive commands, allow the user to provide one-letter - input with a single key (i.e., without hitting enter). - Currently this is used by the `--patch` mode of - linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], - linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this - setting is silently ignored if portable keystroke input - is not available; requires the Perl module Term::ReadKey. - -interactive.diffFilter:: - When an interactive command (such as `git add --patch`) shows - a colorized diff, git will pipe the diff through the shell - command defined by this configuration variable. The command may - mark up the diff further for human consumption, provided that it - retains a one-to-one correspondence with the lines in the - original diff. Defaults to disabled (no filtering). +include::config/interactive.txt[] log.abbrevCommit:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and diff --git a/Documentation/config/interactive.txt b/Documentation/config/interactive.txt new file mode 100644 index 0000000..ad846dd --- /dev/null +++ b/Documentation/config/interactive.txt @@ -0,0 +1,16 @@ +interactive.singleKey:: + In interactive commands, allow the user to provide one-letter + input with a single key (i.e., without hitting enter). + Currently this is used by the `--patch` mode of + linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], + linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this + setting is silently ignored if portable keystroke input + is not available; requires the Perl module Term::ReadKey. + +interactive.diffFilter:: + When an interactive command (such as `git add --patch`) shows + a colorized diff, git will pipe the diff through the shell + command defined by this configuration variable. The command may + mark up the diff further for human consumption, provided that it + retains a one-to-one correspondence with the lines in the + original diff. Defaults to disabled (no filtering). |