aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bashrc6
-rwxr-xr-xemacs/pre-push2
2 files changed, 6 insertions, 2 deletions
diff --git a/bashrc b/bashrc
index 1bbdd4c..2d212d6 100644
--- a/bashrc
+++ b/bashrc
@@ -144,4 +144,8 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
fi
# Add alias for ssh to update the tty
-alias ssh="gpg-connect-agent updatestartuptty /bye >/dev/null; ssh" \ No newline at end of file
+alias ssh="gpg-connect-agent updatestartuptty /bye >/dev/null; ssh"
+
+# Handy alias for the ip command
+alias ip="ip --color"
+alias ipb="ip --color --brief" \ No newline at end of file
diff --git a/emacs/pre-push b/emacs/pre-push
index 9d698a0..22af70f 100755
--- a/emacs/pre-push
+++ b/emacs/pre-push
@@ -70,7 +70,7 @@ do
commit=`git rev-list -n 1 --grep '^emacs:' "$range"`
if [ -n "$commit" ]
then
- __mssola_sync
+ #__mssola_sync
exit 0
fi
fi