From 1458911e037b0db120c5077adbf250e2635f8229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E5=A5=95?= <373852389@qq.com>
Date: Sun, 9 Oct 2016 11:24:22 +0800
Subject: [PATCH] add my personal configuration

---
 .gitignore        |  1 -
 merge_upstream.sh |  0
 my_configs.vim    | 13 +++++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 merge_upstream.sh
 create mode 100644 my_configs.vim

diff --git a/.gitignore b/.gitignore
index 56dee29f..c40b6f34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,5 @@ temp_dirs/yankring_history_v2.txt
 sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
 sources_non_forked/ctrlp.vim/doc/tags*
-my_configs.vim
 tags
 .DS_Store
diff --git a/merge_upstream.sh b/merge_upstream.sh
old mode 100644
new mode 100755
diff --git a/my_configs.vim b/my_configs.vim
new file mode 100644
index 00000000..2da1725d
--- /dev/null
+++ b/my_configs.vim
@@ -0,0 +1,13 @@
+" personal themes
+set background=dark
+colorscheme solarized
+
+"tabspace = 2
+set ts = 2
+set sw = 2
+
+" reload vim environment
+nmap <leader>r :source $MYVIMRC<CR>
+
+
+