From: Junio C Hamano Date: Wed, 17 Mar 2010 21:24:08 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.7.1-rc0~62 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f1ba1c90e1704e937ff59ee510a8d46a5ab52a1a?ds=inline;hp=-c Merge branch 'maint' * maint: Documentation: receive.denyCurrentBranch defaults to 'refuse' bash: complete *_HEAD refs if present --- f1ba1c90e1704e937ff59ee510a8d46a5ab52a1a diff --combined Documentation/config.txt index c80262bc37,437b4ac5ee..805e0511ff --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -555,13 -555,6 +555,13 @@@ it will be treated as a shell command 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' @@@ -1210,10 -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]. @@@ -1453,7 -1442,7 +1453,7 @@@ receive.denyCurrentBranch: out of sync with the index and working tree. If set to "warn", print a warning of such a push to stderr, but allow the push to proceed. If set to false or "ignore", allow such pushes with no - message. Defaults to "warn". + message. Defaults to "refuse". receive.denyNonFastForwards:: If set to true, git-receive-pack will deny a ref update which is