Permalink
Browse files

Revert "Revert "ssh -q""

This reverts commit 19dab41.
  • Loading branch information...
1 parent 19dab41 commit 7b329fc56042d424ceba07d242336e14f6de094d @kylehotchkiss committed Mar 24, 2012
Showing with 12 additions and 0 deletions.
  1. +12 −0 terminal/bash_profile
View
@@ -15,9 +15,21 @@ if [ "$TERM" != "dumb" ]; then
fi
fi
+<<<<<<< HEAD
# ------------------ #
# Output Corrections #
# ------------------ #
LC_COLLATE=C; export LC_COLLATE
alias ls='ls --color'
+=======
+# ---------------- #
+# Coreutils in OSX #
+# ---------------- #
+#PATH="/usr/local/bin:$PATH"
+
+
+# Alias
+alias ls='ls -hF --color --hide="*.pyc"'
+alias ssh='ssh -q'
+>>>>>>> ssh -q

0 comments on commit 7b329fc

Please sign in to comment.