From 484bc0261f51e28878e59d44d2a3f46b0b8a6a46 Mon Sep 17 00:00:00 2001
From: Matthew Cline <zelgadis@sourceforge.net>
Date: Thu, 15 Oct 2009 15:04:50 -0700
Subject: .gitignore: organization, comments, Vim, misc

* Made some more sections headed with a comment and moved lines there.

* Added a Vim modeline so that Vim will treat .gitingore as a config
  file.

* If the same file is opened mulitple times by separate instances of
  Vim, the first swap file will be .FOO.swp, the second .FOO.swo,
  the third .FOO.swn, and so on; deal with having up to three
  swap files.

* A "/" at the start of a filename matches the local repository root,
  so (for example) "/dat" will only match a file named "dat" if it's
  in the top-level directory, rather than matching "dat" anywhere.

* A "/" at the end of a filename means that the file must be a
  directory, so git-status will still note the file's presence if
  it's a link or normal file.
---
 crawl-ref/.gitignore | 62 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 27 deletions(-)

(limited to 'crawl-ref/.gitignore')

diff --git a/crawl-ref/.gitignore b/crawl-ref/.gitignore
index 0f77e83e1d..3dc93c1b27 100644
--- a/crawl-ref/.gitignore
+++ b/crawl-ref/.gitignore
@@ -1,53 +1,61 @@
+# vim:ft=conf
+# The above comment makes vim treat this file as a configuration file
+
 *.[oa]
 *.ann
-*.diff
 *.DS_Store
-saves
-morgue
-*.orig
-*.rej
-*.swp
 core
 core.*
-*.map
 err.txt
-map.dump
-mapgen.log
+TAGS
+
+# Patch related junk
+*.diff
+*.orig
+*.rej
+
+# Text editor generated junk (backup files and such)
+DEADJOE
 \#*
 .#*
 *~
-TAGS
-DEADJOE
+# Vim can generate extra swap files for the same file
+*.sw[nop]
 
+# Crawl generated junk
 arena.result
-
-makefile.dep
+saves
+morgue
+*.map
+map.dump
+mapgen.log
 
 # Tile copied files
-source/dat/tiles/dngn.png
-source/dat/tiles/main.png
-source/dat/tiles/player.png
-source/dat/tiles/gui.png
+/source/dat/tiles/dngn.png
+/source/dat/tiles/main.png
+/source/dat/tiles/player.png
+/source/dat/tiles/gui.png
 
 # Makefile-generated junk
-source/.contrib-ok
+makefile.dep
+/source/.contrib-ok
 
 # The Crawl executable.
-source/crawl
-source/crawl.exe
-source/crawl.pdb
+/source/crawl
+/source/crawl.exe
+/source/crawl.pdb
 
 # Level-compiler generated files.
-source/util/*.cc
-source/util/*.h
+/source/util/*.cc
+/source/util/*.h
 
 # Generated by ./dolinks.sh
-WIZARD
-NORMAL
-dat
+/WIZARD/
+/NORMAL/
+/dat
 
 # Xcode cruft
-source/build
+/source/build
 *.pbxuser
 *.perspectivev3
 *.mode1v3
-- 
cgit v1.2.3-54-g00ecf