-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig
71 lines (63 loc) · 1.86 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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
# vi: ft=gitconfig
[user]
name = David Stark
email = [email protected]
signingkey = ~/.ssh/id_rsa_clovis
;;; use SSH to sign on default
[commit]
gpgsign = true
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = ~/.git_allowed_signers
[push]
default = current
[diff]
tool = nvim
[difftool]
prompt = false
[mergetool "nvim"]
cmd = nvim -d "$LOCAL" "$BASE"
[merge]
tool = nvim
[mergetool]
prompt = false
path = nvim
[alias]
d = difftool
co = checkout
lg = log --graph --abbrev-commit --decorate --date=relative
# 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
# 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
# pf = pull -ff
# credit @Mathias
please = push --force-with-lease
commend = commit -S --amend --no-edit
merc = merge --no-ff --no-edit
rbim = rebase --interactive main
rbi = rebase --interactive
rbm = rebase main
rbc = rebase --continue
# fix = commit --fixup
# wip = commit -S -m \"WIP\"
# rpo = remote prune origin
# rpod = remote prune origin --dry-run
undo = reset --soft HEAD^
# stash-all = stash save --include-untracked
# exec = "!exec "
# root = rev-parse --show-toplevel
#
[core]
excludesfile = /home/starkers/.git_global_ignore
; prefer SSH git over HTTP everyday
[url "[email protected]:"]
insteadOf = https://github.com/
[tag]
forceSignAnnotated = false
; [pull]
; ff = only
[init]
defaultBranch = develop
;;; alternative profiles
[includeIf "gitdir:~/src/github.com/Ki-Insurance/"]
path = ~/.gitconfig-Ki-Insurance