summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Webster <sw_webster@hotmail.com>2011-11-19 10:02:23 +0100
committerMartin Sustrik <sustrik@250bpm.com>2011-11-19 10:02:23 +0100
commita610b3d1b4d975bbffc74604aa43f793dfd3f301 (patch)
tree28b657db657f2d2cef6ee975a18e0255446089af
parentf8bd3967bfe305c22b6e08f3e6555b2162609328 (diff)
Line-ending conversion rules for hg-git users and enabled use of .gitignore by hg-git users
Mercurial does not have built-in support for converting line-endings. This is a settings file for hg eol (http://mercurial.selenic.com/wiki/EolExtension), an extension that replicates the behaviour of git with core.autocrlf=true. Mercurial uses Python regex syntax by default in its .hgignore files. Adding this line to .gitignore overrides that setting, so hg-git users can just create a hardlink to it (e.g "mklink /H .hgignore .gitignore" on Windows) to use it. Signed-off-by: Stuart Webster <sw_webster@hotmail.com>
-rw-r--r--.gitignore1
-rw-r--r--.hgeol2
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3bc8348..1ff594a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+syntax: glob # for hg-git users
Makefile
Makefile.in
configure
diff --git a/.hgeol b/.hgeol
new file mode 100644
index 0000000..a484af6
--- /dev/null
+++ b/.hgeol
@@ -0,0 +1,2 @@
+[patterns]
+** = native