Skip to content

Instantly share code, notes, and snippets.

@MiroRadenovic

MiroRadenovic/gist:5956052

Last active December 19, 2015 12:39
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save MiroRadenovic/5956052 to your computer and use it in GitHub Desktop.
Save MiroRadenovic/5956052 to your computer and use it in GitHub Desktop.
Download ZIP
switched blu to green
Raw
gistfile1.txt
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = "p4merge.exe $LOCAL $REMOTE"
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = "p4merge.exe $BASE $LOCAL $REMOTE $MERGED"
trustExitCode = true
keepBackup = false
[alias]
logtree="log --graph --oneline --decorate --all"
ls = "log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate"
ll = "log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --numstat"
# List oneline commits showing dates:
lds = "log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --date=short"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment