Mercurial > dotfiles
view git/gitconfig @ 383:ff48d206d1f1
Miscellaneous tweaks.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Sat, 05 Aug 2017 22:11:13 -0700 |
parents | a951ca3b5d8c |
children | 4cbf9f8b4a37 |
line wrap: on
line source
[user] name = Ludovic Chabant email = ludovic@chabant.com [push] default = simple [alias] lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all lg = !"git lg1" [include] path = gitconfig-local [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