Skip to content

Instantly share code, notes, and snippets.

Last active December 15, 2017 03:52
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
What would you like to do?
# nicer commit messages :-)
name = Kyle Johnson
email = kyle@[xyz].com
# this is really just for simple commit statements, so pick something console-based, nano is great
editor = nano
tool = p4mergetool
# to keep repos clean
keepBackup = false
diff = always
default = tracking
unstage = reset HEAD --
undo = reset --soft HEAD^
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
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
df = diff
submodule = log
submodulesummary = 1
[mergetool "p4mergetool"]
cmd = /Applications/ $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment