Accidentally, it split a _chapter_ about a file data corrup... conversion for a weird, but common operating system. Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx> --- Petr Baudis, Mon, Jul 28, 2008 18:20:43 +0200: > On Mon, Jul 28, 2008 at 08:31:28AM +0200, Alex Riesen wrote: > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > index 1a13abc..552c134 100644 > > --- a/Documentation/config.txt > > +++ b/Documentation/config.txt > > @@ -149,6 +149,13 @@ core.safecrlf:: > > `core.autocrlf`, git will reject the file. The variable can > > be set to "warn", in which case git will only warn about an > > irreversible conversion but continue the operation. > > + > > +core.trustctime:: > > + If false, the ctime differences between the index and the > > + working copy are ignored; useful when the inode change time > > + is regularly modified by something outside Git (file system > > + crawlers and some backup systems). > > + See linkgit:git-update-index[1]. True by default. > > + > > CRLF conversion bears a slight chance of corrupting data. > > autocrlf=true will convert CRLF to LF during commit and LF to > > Somehow, this particular position of the new hunk does not feel like the > best choice. ;-) > It's alphabetical. Why? Oh, shit... Screw alphabetical Documentation/config.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 552c134..61c3760 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -117,6 +117,13 @@ core.fileMode:: the working copy are ignored; useful on broken filesystems like FAT. See linkgit:git-update-index[1]. True by default. +core.trustctime:: + If false, the ctime differences between the index and the + working copy are ignored; useful when the inode change time + is regularly modified by something outside Git (file system + crawlers and some backup systems). + See linkgit:git-update-index[1]. True by default. + core.quotepath:: The commands that output paths (e.g. 'ls-files', 'diff'), when not given the `-z` option, will quote @@ -149,13 +156,6 @@ core.safecrlf:: `core.autocrlf`, git will reject the file. The variable can be set to "warn", in which case git will only warn about an irreversible conversion but continue the operation. - -core.trustctime:: - If false, the ctime differences between the index and the - working copy are ignored; useful when the inode change time - is regularly modified by something outside Git (file system - crawlers and some backup systems). - See linkgit:git-update-index[1]. True by default. + CRLF conversion bears a slight chance of corrupting data. autocrlf=true will convert CRLF to LF during commit and LF to -- 1.6.0.rc0.76.g581e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
