From: Junio C Hamano Date: Sun, 31 Aug 2008 23:52:53 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.6.1-rc1~282 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7f314565fe20e324e8db1a7c233e43ca4e3683f0?ds=inline;hp=-c Merge branch 'maint' * maint: Document sendemail.envelopesender configuration Document clarification: gitmodules, gitattributes config.txt: Add missing colons after option name --- 7f314565fe20e324e8db1a7c233e43ca4e3683f0 diff --combined Documentation/config.txt index af57d94304,3727239891..ed3285f899 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -572,10 -572,6 +572,10 @@@ diff.autorefreshindex: affects only 'git-diff' Porcelain, and not lower level 'diff' commands, such as 'git-diff-files'. +diff.suppress-blank-empty:: + A boolean to inhibit the standard behavior of printing a space + before each empty output line. Defaults to false. + diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the @@@ -697,7 -693,7 +697,7 @@@ gitcvs.logfile: Path to a log file where the CVS server interface well... logs various stuff. See linkgit:git-cvsserver[1]. - gitcvs.usecrlfattr + gitcvs.usecrlfattr:: If true, the server will look up the `crlf` attribute for files to determine the '-k' modes to use. If `crlf` is set, the '-k' mode will be left blank, so cvs clients will diff --combined Documentation/gitattributes.txt index 1f23d27a61,49a167f241..5fb5007413 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@@ -7,7 -7,7 +7,7 @@@ gitattributes - defining attributes pe SYNOPSIS -------- - $GIT_DIR/info/attributes, gitattributes + $GIT_DIR/info/attributes, .gitattributes DESCRIPTION @@@ -315,14 -315,10 +315,14 @@@ patterns are available - `pascal` suitable for source code in the Pascal/Delphi language. +- `python` suitable for source code in the Python language. + - `ruby` suitable for source code in the Ruby language. - `tex` suitable for source code for LaTeX documents. +- `html` suitable for HTML/XHTML documents. + Performing a three-way merge ~~~~~~~~~~~~~~~~~~~~~~~~~~~~