`23556491e66ab0229034681e1cce8481936e7e7b`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2011-03-16 15:05 UTC

Message

Merge branch 'ssh-agent-append-host-to-environment' of https://github.com/trcjr/oh-my-zsh into trcjr-ssh-agent-append-host-to-environment

Diff

 1diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
 2index ce0d645c1c00ae3494aeeb5ff1f0ebd334b00955..0efc4546f98767de768bef86e9e34169935c4c13 100644
 3--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
 4+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
 5@@ -1,7 +1,7 @@
 6 # Based on code from Joseph M. Reagle
 7 # http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
 8 
 9-local SSH_ENV=$HOME/.ssh/environment
10+local SSH_ENV=$HOME/.ssh/environment-$HOST
11 
12 function start_agent {
13   /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}