-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig
82 lines (82 loc) · 2.56 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
72
73
74
75
76
77
78
79
80
81
82
[alias]
a = !git ls-files -m --exclude-standard | fzf --preview 'git diff --color=always {}' --print0 -m | xargs -0 -t -o git add --patch
aa = add
ap = add --patch
b = !git for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)' | fzf --no-hscroll --no-multi --ansi --preview 'git --no-pager log -50 --pretty=format:\"%h %an (%ar) %s\" {}' --print0 | xargs -0 -t -o git checkout
bc = !git symbolic-ref --short HEAD | tr -d '\\n'
c = commit
ca = commit --amend
cc = !git log --pretty=format:'%h' -n 1 | tr -d '\\n'
ccl = !git rev-parse HEAD | tr -d '\\n'
co = checkout
cob = checkout -b
cop = checkout --patch
cot = !sh -c 'git checkout -t origin/'$1'' -
cp = cherry-pick
d = diff
ds = !DELTA_FEATURES=+side-by-side git diff
f = fetch
fp = pull --ff-only
l = log --graph --stat
ll = 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
lp = log -p
ls = diff-tree --stat -r HEAD~0
p = pull
pu = push
puf = push --force
r = rebase
ra = rebase --abort
rc = rebase --continue
ri = rebase --interactive
rs = rebase --skip
rso = remote set-head origin -a
s = status --short --branch
st = stash
sl = "!git stash list --pretty='%C(yellow)%gd %<(14)%Cgreen%cr %C(blue)%gs' | fzf --ansi --no-multi --preview 'git stash show --color=always -p {1}' | cut -f 1 -d ' ' | xargs -t -o git stash branch stash-$(date +%Y%m%d%H%M)"
su = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
[bash]
showInformativeStatus = true
[color]
status = auto
ui = true
[color "status"]
added = green
changed = yellow
deleted = red
untracked = magenta
[commit]
gpgsign = true
[core]
excludesfile = ~/.gitignore_global
editor = vim +start
compression = 0
[diff]
algorithm = patience
colorMoved = default
tool = difftastic
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difftastic "$LOCAL" "$REMOTE"
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = ~/.ssh/git_allowed_signers
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only --features=interactive
[pack]
windowMemory = 10m
packSizeLimit = 20m
[pager]
difftool = true
[push]
autoRemoteSetup = true
[user]
name = chriszarate
email = chris.zarate@automattic.com
signingkey = ~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/PublicKeys/7c5483cf03f704e9d0d00c339d743a65.pub