-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
70 lines (70 loc) · 2.44 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
[alias]
addp = add -p
addup = !git add -N $1 && git add -p $1
aliases = config --get-regexp alias
amend = commit --amend
bcleangone = "!f() { git fetch -p && git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -d; }; f"
bclean = "!f() { git branch --merged ${1-$(git main-branch)} | grep -v " ${1-$(git main-branch)}$" | xargs -r git branch -d; }; f"
blist = "for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'"
br = branch
ci = commit
co = checkout
conflicted = show --cc
df = diff
diffc = diff --cached
diffcw = diff --cached --word-diff=color
diffw = diff --word-diff=color
fix = commit --amend --no-edit
fpush = push --force-with-lease
heir = log --all --graph --decorate --oneline --simplify-by-decoration
lg = log --graph --pretty=format:'%Cgreen%h%Creset -%Creset %s%C(yellow)%d %Cblue(%aN, %cr)%Creset' --abbrev-commit --date=relative
main-branch = !git symbolic-ref refs/remotes/origin/HEAD | cut -d'/' -f4
mg = merge --no-ff
mt = mergetool
po = "!git push --set-upstream origin \"$(git rev-parse --abbrev-ref HEAD)\""
remotesh = remote set-head origin --auto
res = restore --staged
slog = log --pretty=oneline --graph --abbrev-commit
st = status
stashsome = stash --keep-index
unpub = log --branches --not --remotes
up = pull --rebase --prune
who = shortlog -s --
[code]
editor = code --wait
[commit]
gpgsign = true
[color]
ui = true
[core]
autocrlf = input
editor = code --wait
excludesfile = ~/.gitignore
pager = diff-so-fancy | less --tabs=4 -RFX
[credential]
helper = /mnt/c/Program\\ Files/Git/mingw64/bin/git-credential-manager.exe
[diff]
tool = code
[difftool "code"]
cmd = code --wait --diff $LOCAL $REMOTE
[gpg]
format = ssh
[gpg "ssh"]
program = /mnt/c/Users/krist/AppData/Local/1Password/app/8/op-ssh-sign.exe
[merge]
tool = code
[mergetool "code"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[pager]
diff = diff-so-fancy | less --tabs=4 -RFXS --pattern '^(Date|added|deleted|modified): '
[push]
default = simple
[pull]
rebase = true
[rebase]
autostash = true
autosquash = true
[user]
name = Kristian Tryggestad
email = kristian.tryggestad@gmail.com
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzI9P+xHpKe/r/e2rVXEx5M2064iu+fJJp4idihZjC8