Useful aliases for git

gistfile1.txt

#ignore file(s), add file(s), list file(s) 
assume   = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed  = "!git ls-files -v | grep ^h | cut -c 3-"

#call your last stash a snapshot
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"

#merging
ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"