summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xLink-Them2
-rw-r--r--gitconfig2
-rw-r--r--gitignore1
3 files changed, 4 insertions, 1 deletions
diff --git a/Link-Them b/Link-Them
index 8fdfac7..e30c1cc 100755
--- a/Link-Them
+++ b/Link-Them
@@ -12,7 +12,7 @@ else
relpath="${dir##$HOME/}/"
fi
-for file in bash_profile bashrc gitconfig screenrc vimrc zshrc zshfunc; do
+for file in bash_profile bashrc gitconfig gitignore screenrc vimrc zshrc zshfunc; do
if [ -L "$HOME/.$file" ]; then
if [ "$(readlink "$HOME/.$file")" = "$dir/$file" ]; then # old style symlink, remove
rm -v -f "$HOME/.$file"
diff --git a/gitconfig b/gitconfig
index bc45e69..125993e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -21,3 +21,5 @@
mergeoptions = --no-ff --no-commit
[branch "debian"]
mergeoptions = --no-ff --no-commit
+[core]
+ excludesfile = ~/.gitignore
diff --git a/gitignore b/gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/gitignore
@@ -0,0 +1 @@
+*.swp