Skip to content

Instantly share code, notes, and snippets.

@etobi
Created January 5, 2015 11:42
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save etobi/ea235b89d11ce28b660b to your computer and use it in GitHub Desktop.
Save etobi/ea235b89d11ce28b660b to your computer and use it in GitHub Desktop.
[alias]
st = status -sb
spu = stash
spo = stash pop
ci = commit
br = branch
co = checkout
cp = cherry-pick
df = diff
dfword = diff --color-words
fa = fetch --all --tags
lg = log -p
commit --all
lol = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
lola = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all --
lostat = log --stat --abbrev-commit
ls = ls-files
stashpull = !git stash && git pull && git stash pop
subup = submodule update --init --recursive
ass = add
[user]
name = Tobias Liebig
email = work@etobi.de
[branch]
autosetuprebase = remote
autosetupmerge = true
[color]
ui = auto
diff = auto
status = auto
branch = auto
interactive = auto
[color "diff"]
whitespace = red reverse
[core]
excludesfile = /Users/tobias/.gitignore_global
filemode = false
pager = less -r
whitespace = trailing-space,space-before-tab
editor = /usr/bin/vim
ignorecase = false
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[push]
default = current
[merge]
ff = false
stat = true
[diff]
renames = copies
mnemonicprefix = true
[advice]
statusHints = false
[rerere]
enabled = true
[init]
templatedir = ~/.git-templates
.DS_Store
/.idea
.idea
#!/bin/sh
MY_TIME=$(date +%s)
/usr/local/bin/imagesnap -q -w 3 $HOME/gitshots/$MY_TIME.jpg
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment