-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
50 lines (50 loc) · 1.97 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
40
41
42
43
44
45
46
47
48
49
50
[user]
name = Jason Hollis
email = [email protected]
signingkey = "F9AF7F330FE23D4B"
[includeIf "gitdir:work/"]
path = ~/.gitconfig-work
[color]
ui = true
[push]
default = simple
gpgsign = if-asked
[core]
editor = vim
excludesfile = ~/.gitignore
whitespace = trailing-space,space-before-tab
[alias]
d = difftool
bav = !sh -c 'git --no-pager branch -av'
bvv = !sh -c 'git --no-pager branch -vv'
lga = log --graph --abbrev-commit --decorate --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
lg = log --graph --abbrev-commit --decorate --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)'
lgda = log --show-signature --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) %C(dim white)- %an%C(reset)%n''%C(white)%B%C(reset)' --all
lgd = log --show-signature --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) %C(dim white)- %an%C(reset)%n''%C(white)%B%C(reset)'
# lg = !"git lg1"
fs = diff --stat HEAD
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
pr = !sh -c 'git fetch $1 pull/$2/head:pr-$1-$2 && git checkout pr-$1-$2' -
mbd = !sh -c 'git branch -d mr-$1-$2' -
pbd = !sh -c 'git branch -d pr-$1-$2' -
parent = "!git show-branch -a | grep '*' | grep -v \"$(git rev-parse --abbrev-ref HEAD)\" | head -n1 | sed 's/.*\\[\\(.*\\)\\].*/\\1/' | sed 's/[\\^~].*//'"
[diff]
tool = vimdiff
[merge]
tool = vimdiff
[merge "ours"]
driver = true
[difftool]
prompt = false
[fetch]
prune = true
[apply]
whitespace = fix
[pull]
ff = only
[credential]
helper = cache
[commit]
gpgsign = true
[gpg]
program = /usr/bin/gpg