Skip to content

Instantly share code, notes, and snippets.

@miharekar
Last active August 29, 2015 14:06
Show Gist options
  • Save miharekar/c860d3f92782ff5ac87d to your computer and use it in GitHub Desktop.
Save miharekar/c860d3f92782ff5ac87d to your computer and use it in GitHub Desktop.
dotfiles
[user]
name = Miha Rekar
email = info@mr.si
[core]
editor = atom -nw
[color]
ui = 1
[alias]
s = status -sb
c = commit
ca = commit -a
cb = checkout -b
p = push
h = push heroku master
lg = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"
delete-merged = "!git branch --merged | grep -v '\\*\\|master' | xargs -n 1 git branch -d"
ksreview = "!f() { local SHA=${1:-HEAD}; local BRANCH=${2:-master}; if [ $SHA == $BRANCH ]; then SHA=HEAD; fi; git difftool -y -t Kaleidoscope $BRANCH...$SHA; }; f"
[push]
default = simple
[difftool "Kaleidoscope"]
cmd = "ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\""
[mergetool "Kaleidoscope"]
cmd = "ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot"
trustExitCode = true
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool]
prompt = false
keepBackup = false
[merge]
tool = Kaleidoscope
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[branch]
autosetuprebase = always
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
require 'hirb'
Hirb.enable
old_print = Pry.config.print
Pry.config.print = proc do |*args|
Hirb::View.view_or_page_output(args[1]) || old_print.call(*args)
end
# Path to your oh-my-zsh installation.
export ZSH=$HOME/.oh-my-zsh
# Set name of the theme to load.
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
# Get pure at https://github.com/sindresorhus/pure
ZSH_THEME="pure"
# Uncomment the following line to display red dots whilst waiting for completion.
COMPLETION_WAITING_DOTS="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
# For hub download: https://github.com/github/hub/blob/master/etc/hub.zsh_completion into plugins/hub/_hub
plugins=(git hub brew chruby docker heroku rails rake zsh-syntax-highlighting)
source $ZSH/oh-my-zsh.sh
# User configuration
# export MANPATH="/usr/local/man:$MANPATH"
export PATH="/usr/local/bin:$PATH"
# Preferred editor
export EDITOR='atom'
# Docker IP
export DOCKER_HOST=tcp://$(boot2docker ip 2>/dev/null):2375
# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
alias git=hub
alias gcb="g cb"
alias be="bundle exec"
alias drink="brew update && brew upgrade && brew cleanup -s -force && brew cask cleanup && brew doctor"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment