mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-04-03 04:20:01 +02:00
Conflict merge 1
This commit is contained in:
commit
4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
|
|
@ -7,6 +7,7 @@ alias p='tail -1 /home/pdavis/notes.txt | pbcopy'
|
|||
alias pbcopy='xsel --clipboard --input'
|
||||
alias rosh='ssh pdavis-admin@opsware.discovery.com -p 2222'
|
||||
alias console='cu -t -l /dev/ttyUSB0 -s 115200'
|
||||
<<<<<<< HEAD
|
||||
alias open='ssh $1 -l pdavis-admin'
|
||||
alias home='ssh netinstall@pebcac.org'
|
||||
alias myrouter='ssh tunnel@192.168.10.1'
|
||||
|
|
@ -15,4 +16,7 @@ alias pswitch='ssh tunnel@192.168.10.4'
|
|||
alias jumphost='ssh pdavis@jumphost.pebcac.org'
|
||||
|
||||
# Start with tmux
|
||||
=======
|
||||
alias open='ssh $1 -l pdavis-admin'
|
||||
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
|
||||
[[ $TERM != "screen" ]] && exec tmux
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue