comparison 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
comparison
equal deleted inserted replaced
382:c3a863440b1a 383:ff48d206d1f1
10 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 10 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
11 lg = !"git lg1" 11 lg = !"git lg1"
12 12
13 [include] 13 [include]
14 path = gitconfig-local 14 path = gitconfig-local
15 [difftool "sourcetree"]
16 cmd = opendiff \"$LOCAL\" \"$REMOTE\"
17 path =
18 [mergetool "sourcetree"]
19 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
20 trustExitCode = true