comparison git/gitconfig @ 454:54bdd1f0f873

Make OS-specific configs for Git.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 13 Nov 2018 09:55:24 -0800
parents f464cf177151
children 2279514d82e4
comparison
equal deleted inserted replaced
453:97a94dacfd54 454:54bdd1f0f873
1 [user] 1 [user]
2 name = Ludovic Chabant 2 name = Ludovic Chabant
3 email = ludovic@chabant.com 3 email = ludovic@chabant.com
4 4
5 [push] 5 [push]
6 default = simple 6 default = simple
7 7
8 [alias] 8 [alias]
9 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 9 tags = tag -l
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 branches = branch -a
11 lg = !"git lg1" 11 remotes = remote -v
12 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
13 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
14 lg = !"git lg1"
12 15
13 [include] 16 [include]
14 path = gitconfig-local 17 path = gitconfig-${OS}
15 [difftool "sourcetree"] 18 path = gitconfig-local
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
21 [core]
22 excludesfile = /Users/abdul/.gitignore_global
23 [commit]
24 template = /Users/abdul/.stCommitMsg
25 19
26 # vim: ft=gitconfig 20 # vim:ft=gitconfig:ts=2:sw=2