From 8701d27aee281d7a6980cd5ff57a83c5574351e3 Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Sun, 13 Apr 2008 14:49:13 +0200 Subject: [PATCH] WinGit: Add notice about new "autocrlf=true" default Before starting the installation, the installer now displays a compatibility notice about the changed autocrlf default. We use the license dialog to do so. This is a simple way requiring no modifications to the installer script. In a later version, we should revert to the old text. --- share/resources/gpl-2.0.rtf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/share/resources/gpl-2.0.rtf b/share/resources/gpl-2.0.rtf index fd6c3ad4..952215b1 100644 --- a/share/resources/gpl-2.0.rtf +++ b/share/resources/gpl-2.0.rtf @@ -1,14 +1,20 @@ -{\rtf1\ansi\ansicpg1250\deff0\deflang1033\deflangfe1060{\fonttbl{\f0\fswiss\fprq2\fcharset238 Verdana;}{\f1\fmodern\fprq1\fcharset238 Lucida Console;}} -{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\nowidctlpar\sb100\sa100\qc\lang1060\kerning36\b\f0\fs28 GNU General Public License\par +{\rtf1\ansi\ansicpg1250\deff0\deflang1033\deflangfe1060{\fonttbl{\f0\fswiss\fprq2\fcharset0 Verdana;}{\f1\fswiss\fprq2\fcharset238 Verdana;}{\f2\fmodern\fprq1\fcharset238 Lucida Console;}} +{\colortbl ;\red255\green0\blue0;} +{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\nowidctlpar\sb100\sa100\qc\cf1\kerning36\b\f0\fs28 Important Compatibility Notice\par +\pard\nowidctlpar\fi90\sb100\sa100\kerning0\b0\fs16 With Git 1.5.5, the default for core.autocrlf changes to "true". This means that Git converts line endings to CRLF (Windows line endings) in your work tree and to LF (Unix line endings) in the repository. This is the right choice for cross-platform projects. If you wish to keep the old behavior, you can run\par +\pard\nowidctlpar\sb100\sa100\qc git config --global core.autocrlf false\par +\pard\nowidctlpar\sb100\sa100\lang1060\f1 \lang1033\f0 for the user accounts that shall use the old default; or you can set the system-wide default by editing "etc/gitconfig" in the installation directory.\par +\cf0 Git is licensed under the GPL:\lang1060\f1\par +\pard\nowidctlpar\sb100\sa100\qc\kerning36\b\fs28 GNU General Public License\par \kerning0\b0\fs16 Version 2, June 1991\par -\pard\nowidctlpar\f1\fs14\par +\pard\nowidctlpar\f2\fs14\par Copyright (C) 1989, 1991 Free Software Foundation, Inc.\par 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\par \par Everyone is permitted to copy and distribute verbatim copies\par of this license document, but changing it is not allowed.\par \par -\pard\keepn\nowidctlpar\sb100\sa100\qc\b\f0\fs20 Preamble\fs24\par +\pard\keepn\nowidctlpar\sb100\sa100\qc\b\f1\fs20 Preamble\fs24\par \pard\nowidctlpar\fi142\sb100\sa100\b0\fs16 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. \par When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. \par To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. \par -- 2.11.4.GIT