various gitconfig and ignore stuff

12 years ago · 36d7a24674
parent c3e7c87574
commit 36d7a24674
11 changed files with 39 additions and 11 deletions
--- a/1
+++ b/1
@ -33,6 +33,7 @@
  ps = push
  pl = pull
  mg = merge
+  unst = reset HEAD
  hub = push origin master
  subup = submodule foreach git pull
  rs = reset master --hard
--- a/31
+++ b/31
@ -1,6 +1,33 @@
+# always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*.bak
+
+# other stuff
 *~
-.DS_Store
-.svn
+*.sass-cache
 .tmp_*
 .revision

+# OS or editor folders
+.DS_Store
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.komodoproject
+.komodotools
+
+# vcs-folders to ignore
+.hg
+.svn
+.CVS
--- a/2
+++ b/2
@ -22,7 +22,7 @@ alias apachestart='sudo /usr/sbin/apachectl start'
 alias apachestop='sudo /usr/sbin/apachectl stop'
 alias mysqlstart='mysql.server start'
 alias mysqlstop='mysql.server stop'
-alias dev='apachestart && mysqlstart && cd ~/Sites && ls'
+alias dev='apachestart && mysqlstart'
 alias devs='apachestop && mysqlstop'

 # start virtuoso
--- a/vim/bundle/buffergator
+++ b/vim/bundle/buffergator
@ -1 +1 @@
-Subproject commit 9c9b234f550a6dd8c2e4aef66665ea4e95cb8250
+Subproject commit cb6bbe7ca15f6316b277f73805e38096723f1f3e
--- a/vim/bundle/ctrlp
+++ b/vim/bundle/ctrlp
@ -1 +1 @@
-Subproject commit 4d5b39c0cf005bc48e6d5916e631c0b444ebc419
+Subproject commit 2927ce4eabbe03a3fb008b0bfbe0fb02dcaf55b2
--- a/vim/bundle/fugitive
+++ b/vim/bundle/fugitive
@ -1 +1 @@
-Subproject commit 5298448e8895e70c401bbf394b8aa948135dd261
+Subproject commit 745ccf50662fc18c11e0c7a397b59e07a5a13141
--- a/vim/bundle/gist
+++ b/vim/bundle/gist
@ -1 +1 @@
-Subproject commit f45d9383c6286250f910043573a976889a6798db
+Subproject commit aad7fb31849c548ec21fcb018e2bf49629f4f290
--- a/vim/bundle/nrrwrgn
+++ b/vim/bundle/nrrwrgn
@ -1 +1 @@
-Subproject commit c48e9256cb4325c8ed36414f91053d73809ff390
+Subproject commit 39b1ffe9f6e7e1b6ef4394c29ae0c88f4da8201c
--- a/vim/bundle/snipmate
+++ b/vim/bundle/snipmate
@ -1 +1 @@
-Subproject commit 34ab1a73640893e4edbf4ccbbc49eeaf4febdd5e
+Subproject commit b42f80ff212d251062cda66429ad1a0af8c39781
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@ -1 +1 @@
-Subproject commit 7b3b63e6df60733382047086eb26b2cc59b3a239
+Subproject commit 6818c45710b2e889c85ae9ca88ac1c1d2b5d2420
--- a/vim/bundle/tagbar
+++ b/vim/bundle/tagbar
@ -1 +1 @@
-Subproject commit 768cd6b908331800e7995b2f1dcb3e561f5669c2
+Subproject commit e690a5e97da00bfd3d9a6d757f9016f49d016893