Skip to content

Instantly share code, notes, and snippets.

@nelsonpecora
Created November 28, 2012 16:15
Show Gist options
  • Select an option

  • Save nelsonpecora/4162270 to your computer and use it in GitHub Desktop.

Select an option

Save nelsonpecora/4162270 to your computer and use it in GitHub Desktop.
.gitconfig for work. Has some cool aliases.
[user]
name = Nelson Pecora
email = [email protected]
[core]
excludesfile = ~/.gitignore
[credential]
helper = osxkeychain
[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
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope
[alias]
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
le = log --oneline --decorate
fl = log -u
dlc = diff --cached HEAD^
f = "!git ls-files | grep -i"
grep = grep -Ii
gr = grep -Ii
la = "!git config -l | grep alias | cut -c 7-"
done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment