-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
39 lines (33 loc) · 1.54 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
31
32
33
34
35
36
37
38
39
[user]
name = Mark Perryman
email = mark.perryman@metaswitch.com
[push]
default = simple
[alias]
lg = !"git fetch --all --prune --quiet; git lg1"
lg1 = !"git lg1-specific --all"
lg2 = !"git lg2-specific --all"
lg3 = !"git lg3-specific --all"
lg1-specific = log --color --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(normal)%s%C(reset) %C(white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
lg2-specific = 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(normal)%s%C(reset) %C(dim white)- %an%C(reset)'
lg3-specific = 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 cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(normal)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
watch = !"watch --color --interval 5 'git lg | ccut'"
new-issue = !"f() { git checkout master -b $1 && git push --set-upstream ${2:-gitlab} $1; }; f"
[core]
editor = vim
[diff]
tool = vimdiff
[merge]
tool = diffconflicts
[mergetool "diffconflicts"]
cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
keepBackup = false
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[init]
templatedir = ~/.git_template