Merge branch 'master' of majnematic.com:davesdots

majnemer · majnemer · commit 541e704017d5 · 2010-04-17T17:00:43.000-05:00
diff --git a/ackrc b/ackrc
@@ -0,0 +1 @@
+--type-add=asm=.S
diff --git a/commonsh/10_alias b/commonsh/10_alias
@@ -89,6 +89,10 @@ if ( command -v gobjdump >/dev/null 2>&1 ) ; then
 	alias objdump=gobjdump
 fi
 
+if ( command -v ack-grep >/dev/null 2>&1 ) ; then
+	alias ack=ack-grep
+fi
+
 alias rm='rm -ir'
 
 alias df='df -h'
diff --git a/gitconfig b/gitconfig
@@ -20,6 +20,8 @@
 	cat  = show
 	list = show
 	ls   = show
+
+	untrack-ignored = !git-untracked-ignored
 [color]
 	diff = auto
 	status = auto
diff --git a/install.pl b/install.pl
@@ -38,6 +38,7 @@
 
 my %links = (
 	screenrc   => '.screenrc',
+	ackrc      => '.ackrc',
 	toprc      => '.toprc',
 	dir_colors => '.dir_colors',
 	lessfilter => '.lessfilter',
