]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d249515 942e774)
Merge branch 'eb/core-eol'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:49 +0000 (06:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:49 +0000 (06:02 -0700)
commitd5cff17edaf438bbf45a2130e9cadc0c938291d6
tree19acab3f0fbb8fa480cb45a315d0dac2e6f16ab1tree | snapshot
parentd249515f297d47df6d79167b988eaa7db0981178commit | diff
parent942e7747678ecf5f118ea5b2d0c763166de21f3acommit | diff
Merge branch 'eb/core-eol'

* eb/core-eol:
  Add "core.eol" config variable
  Rename the "crlf" attribute "text"
  Add per-repository eol normalization
  Add tests for per-repository eol normalization

Conflicts:
Documentation/config.txt
Makefile
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/git-cvsserver.txt diff1 | diff2 | blob | history
Documentation/gitattributes.txt diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
attr.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
convert.c diff1 | diff2 | blob | history
environment.c diff1 | diff2 | blob | history
git-cvsserver.perl diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.