From ed94530572657b2a11472868d3ef784ad8b02646 Mon Sep 17 00:00:00 2001
From: Frank Terbeck <ft@bewatermyfriend.org>
Date: Wed, 30 Nov 2011 22:05:16 +0100
Subject: [PATCH] zshrc: Remove 1-char aliases: 0, g, s, S

Signed-off-by: Frank Terbeck <ft@bewatermyfriend.org>
---
 doc/grmlzshrc.t2t | 12 ------------
 etc/zsh/zshrc     | 10 ----------
 2 files changed, 22 deletions(-)

diff --git a/doc/grmlzshrc.t2t b/doc/grmlzshrc.t2t
index 4f9342a..c87b863 100644
--- a/doc/grmlzshrc.t2t
+++ b/doc/grmlzshrc.t2t
@@ -762,9 +762,6 @@ Prints installed Packages sorted by size (descending).
 Lists files (including dot files) sorted by size (biggest last) in long and
 human readable output format.
 
-: **g** (//git//)
-Revision control system by Linus Torvalds.
-
 : **ge** (//grep-excuses//)
 Searches the testing excuses files for a specific maintainer (See:
 grep-excuses(1)).
@@ -882,12 +879,6 @@ as config file. If invoked by a regular user, start a screen session
 with users .screenrc config if it exists, else use /etc/grml/screenrc_grml
 as configuration.
 
-: **S** (//screen//)
-Short for screen(1).
-
-: **s** (//ssh//)
-Short for ssh(1).
-
 : **su** (//sudo su//)
 If user is running a grml live-CD, dont ask for any password, if she
 wants a root shell.
@@ -911,9 +902,6 @@ by sudo, if necessary. See au and ag above.
 After calling, characters of URLs as typed get automatically escaped, if necessary, to
 protect them from the shell.
 
-: **0** (//return 0//)
-Gives a clean prompt (i.e. without $?).
-
 : **$(uname -r)-reboot** (//kexec -l --initrd=/boot/initrd.img-"$(uname -r)" --command-line=\"$(cat /proc/cmdline)\" /boot/vmlinuz-"$(uname -r)"//)
 Reboots using kexec(8) and thus reduces boot time by skipping hardware initialization of BIOS/firmware.
 
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index b0aa090..183ebc4 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1457,13 +1457,6 @@ iso2utf() {
     fi
 }
 
-# I like clean prompt, so provide simple way to get that
-check_com 0 || alias 0='return 0'
-
-# for really lazy people like mika:
-check_com S &>/dev/null || alias S='screen'
-check_com s &>/dev/null || alias s='ssh'
-
 # especially for roadwarriors using GNU screen and ssh:
 if ! check_com asc &>/dev/null ; then
   asc() { autossh -t "$@" 'screen -RdU' }
@@ -2263,9 +2256,6 @@ alias insecscp='scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/nu
 # simple webserver
 check_com -c python && alias http="python -m SimpleHTTPServer"
 
-# Use 'g' instead of 'git':
-check_com g || alias g='git'
-
 # work around non utf8 capable software in utf environment via $LANG and luit
 if check_com isutfenv && check_com luit ; then
     if check_com -c mrxvt ; then
-- 
2.1.4