-
Notifications
You must be signed in to change notification settings - Fork 3
/
.gitconfig
30 lines (29 loc) · 1.15 KB
/
.gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
[user]
name = Marinofull
email = [email protected]
username = Marinofull
signingkey = 5333B41BC8940B01
[alias]
lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(black)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lg2 = log --graph --format=format:'%C(bold blue)%h - %C(bold cyan)%aD %C(bold green)(%ar)%C(yellow)%d%n %C(bold white)%an%C(reset) - %s ' --all
lg = !"git lg2"
myself = 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(bold white) %an%C(reset) - %C(white)%s%C(reset)'
checkoutback = checkout @{-1}
transfer = "!f() { git push $2 refs/remotes/$1/*:refs/heads/*;}; f"
[diff]
guitool = meld
[color]
ui = true
[core]
editor = vim -c Spellit
pager = less
excludesfile = ~/.gitignore_global
[commit]
gpgsign = true
[merge]
tool = meld
[mergetool "diffconflicts"]
cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
trustExitCode = true
[mergetool]
keepBackup = false