Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ranman/dotfiles
base: 131a9e6faa
...
head fork: ranman/dotfiles
compare: 17c79f7164
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 18 additions and 2 deletions.
  1. +15 −0 .gitconfig
  2. +2 −1  .zshrc
  3. +1 −1  post-commit
View
15 .gitconfig
@@ -10,3 +10,18 @@
ui = true
[push]
default = simple
+[alias]
+ co = checkout
+[difftool "Kaleidoscope"]
+ cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[diff]
+ tool = Kaleidoscope
+[difftool]
+ prompt = false
+[mergetool "Kaleidoscope"]
+ cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+ trustExitCode = true
+[mergetool]
+ prompt = false
+[merge]
+ tool = Kaleidoscope
View
3  .zshrc
@@ -36,7 +36,7 @@ alias cr="python \~/dev/10gen/scratch/tools/upload.py \-y \-s codereview.10gen.c
# Vim style command editing
autoload edit-command-line
zle -N edit-command-line
-bindkey '^Xe' edit-command-line
+bindkey '^x^e' edit-command-line
# pip virtualenv support
export PIP_VIRTUALENV=$WORKON_HOME
@@ -47,5 +47,6 @@ if [[ -f "$HOME/.amazon_keys" ]]; then
fi
if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+alias knife='nocorrect knife'
POWERLINE_NO_BLANK_LINE="true"
POWERLINE_DETECT_SSH="true"
View
2  post-commit
@@ -2,6 +2,6 @@
file="~/.gitshots/#{Time.now.to_i}.jpg"
unless File.directory?(File.expand_path("../../rebase-merge", __FILE__))
puts "Taking capture into #{file}!"
- system "imagesnap -q -w 3 #{file} &"
+ system "imagesnap -q -w 1 #{file} &"
end
exit 0

No commit comments for this range

Something went wrong with that request. Please try again.