Created
October 1, 2013 18:03
-
-
Save 5thWall/6782514 to your computer and use it in GitHub Desktop.
Dotfiles from work
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
export TERM=msys | |
# Aliases | |
alias please='sudo' | |
alias ls='ls --color=auto' | |
alias subl='/c/Program\ Files/Sublime\ Text\ 2/sublime_text.exe' | |
alias releasenotes="git log --oneline --no-merges `git describe --abbrev=0 --tags`..HEAD | cut -c 9- | sort | subl" | |
## Navigation | |
alias assets='cd ~/src/assets/' | |
alias web='cd /y/wwwroot/' | |
# Functions | |
## Diff | |
function sdiff { | |
diff -ub $1 $2 > /tmp/diff | |
subl /tmp/diff | |
} | |
function old_diff { | |
cat > /tmp/old_diff | |
} | |
function new_diff { | |
sdiff /tmp/old_diff - | |
} | |
## Other | |
function mkcd() { | |
mkdir -p "$1" && cd "$1" | |
} | |
function to_subl { | |
cat > /tmp/to_subl | |
subl /tmp/to_subl | |
} | |
#Paths | |
#add ruby | |
export PATH=$PATH:/c/Ruby193/bin | |
# SSH | |
SSH_ENV="$HOME/.ssh/environment" | |
# start the ssh-agent | |
function start_agent { | |
echo "Initializing new SSH agent..." | |
# spawn ssh-agent | |
ssh-agent | sed 's/^echo/#echo/' > "$SSH_ENV" | |
echo succeeded | |
chmod 600 "$SSH_ENV" | |
. "$SSH_ENV" > /dev/null | |
ssh-add | |
} | |
# test for identities | |
function test_identities { | |
# test whether standard identities have been added to the agent already | |
ssh-add -l | grep "The agent has no identities" > /dev/null | |
if [ $? -eq 0 ]; then | |
ssh-add | |
# $SSH_AUTH_SOCK broken so we start a new proper agent | |
if [ $? -eq 2 ];then | |
start_agent | |
fi | |
fi | |
} | |
function load_ssh_agent { | |
if [ -f "$SSH_ENV" ]; then | |
. "$SSH_ENV" > /dev/null | |
fi | |
ps -ef | grep "$SSH_AGENT_PID" | grep ssh-agent > /dev/null | |
if [ $? -eq 0 ]; then | |
test_identities | |
else | |
start_agent | |
fi | |
} | |
# check for running ssh-agent with proper $SSH_AGENT_PID | |
echo "checking for running ssh-agent with proper SSH_AGENT_PID" | |
if [ -n "$SSH_AGENT_PID" ]; then | |
ps -ef | grep "$SSH_AGENT_PID" | grep ssh-agent > /dev/null | |
if [ $? -eq 0 ]; then | |
test_identities | |
else | |
# either there is no process with that PID or it does not correspond | |
# to ssh-agent | |
load_ssh_agent | |
fi | |
# if $SSH_AGENT_PID is not properly set, we might be able to load one from | |
# $SSH_ENV | |
else | |
load_ssh_agent | |
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[alias] | |
# Log aliases | |
hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | |
l = log --pretty=oneline -n 20 --graph | |
lol = log --graph --decorate --pretty=oneline --abbrev-commit | |
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all | |
# Do stuff | |
ch = checkout | |
go = checkout -B | |
unstage = reset HEAD | |
# Quieter status messages | |
s = status -sb | |
# Default ignoring whitespace | |
diff = diff -w | |
blame = blame -w | |
# Add and Commit | |
ca = commit -a | |
cm = commit -m | |
cam = commit -am | |
aa = add --all | |
[user] | |
name = Andy | |
email = Andrew.Arminio@nau.edu | |
[color] | |
branch = auto | |
ui = True | |
[color "branch"] | |
current = yellow reverse | |
local = yellow | |
remote = green | |
[color "diff"] | |
meta = yellow | |
frag = blue bold reverse | |
old = red | |
new = green | |
[core] | |
editor = vim | |
autocrlf = true | |
excludesfile = c:/Users/aga7/.gitignore | |
filemode = false | |
[push] | |
default = simple | |
[help] | |
autocorrect = 1 | |
format = web |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment