X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=c80262bc37065bc2f7fe16427df0940840614e45;hb=2949151fe9d92b2c3405f188e650d9bb7b46c663;hp=7103172ed30c33f2c7933f530d03ce98c1e4f360;hpb=6eb3adff9e3b4d37903c8a2e0e708049ad154617;p=git.git diff --git a/Documentation/config.txt b/Documentation/config.txt index 7103172ed..c80262bc3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -555,6 +555,13 @@ it will be treated as a shell command. For example, defining executed from the top-level directory of a repository, which may not necessarily be the current directory. +am.keepcr:: + If true, git-am will call git-mailsplit for patches in mbox format + with parameter '--keep-cr'. In this case git-mailsplit will + not remove `\r` from lines ending with `\r\n`. Can be overrriden + by giving '--no-keep-cr' from the command line. + See linkgit:git-am[1], linkgit:git-mailsplit[1]. + apply.ignorewhitespace:: When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the '--ignore-space-change' @@ -1203,6 +1210,10 @@ imap:: The configuration variables in the 'imap' section are described in linkgit:git-imap-send[1]. +init.templatedir:: + Specify the directory from which templates will be copied. + (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) + instaweb.browser:: Specify the program that will be used to browse your working repository in gitweb. See linkgit:git-instaweb[1].