dotfiles/gitconfig

136 lines
3.4 KiB
Plaintext
Raw Normal View History

2021-03-15 14:18:21 +00:00
[include]
2021-03-17 06:34:26 +00:00
# local and/or misc changes not committed to Git:
path = .gitconfig.local
2021-03-15 14:18:21 +00:00
[alias]
2021-03-17 06:34:26 +00:00
aa = add .
2021-05-17 09:27:57 +00:00
acf = !git add . && git cf
2021-12-30 13:25:49 +00:00
acfp = !git add . && git cf && git push
2021-03-17 06:34:26 +00:00
adp = add -p
2021-05-06 12:46:45 +00:00
an = add -N .
2021-10-08 12:27:22 +00:00
adn = an
2021-06-22 10:04:38 +00:00
b = branch
2021-03-17 06:34:26 +00:00
bn = rev-parse --abbrev-ref HEAD
br = branch
2021-07-21 09:12:56 +00:00
ca = commit --amend --no-edit
2021-12-20 20:09:24 +00:00
cad = !git commit --amend --no-edit --date \"$(date)\"
2021-07-21 09:12:56 +00:00
cae = commit --amend
2021-06-28 11:08:41 +00:00
cdf = clean -df
cdfn = clean -dfn
2021-05-03 08:17:01 +00:00
cf = !git commit --fixup $(git log --invert-grep --grep fixup -n1 --oneline --format=format:%h)
2021-05-06 12:46:45 +00:00
chp = checkout -p
2021-03-17 06:34:26 +00:00
ci = commit
2021-03-21 15:10:06 +00:00
cl = clone
2021-04-08 08:53:27 +00:00
cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' --
2021-03-17 06:34:26 +00:00
co = checkout
2021-08-13 08:07:56 +00:00
cols = !git checkout $(git branch | fzf)
2024-09-23 06:16:57 +00:00
comb = !git checkout $(git mainbranch)
cost = checkout staging
2021-03-17 06:34:26 +00:00
cp = cherry-pick
2021-10-20 14:23:27 +00:00
cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn"
2022-02-07 17:47:46 +00:00
cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn"
2023-06-30 03:12:15 +00:00
cp4 = "!fn() { git cherry-pick $1~4..$1; }; fn"
2021-08-13 08:07:56 +00:00
cpls = !git cp $(git ls)
2021-03-17 06:34:26 +00:00
d = diff
2021-10-13 13:23:56 +00:00
dls = !git diff $(git branch | fzf)
2023-07-07 10:08:50 +00:00
dom = !git diff origin/$(git mainbranch)...
2021-05-17 09:27:57 +00:00
drb = !git diff $(git rb)
2021-03-17 06:34:26 +00:00
ds = diff --staged
f = fetch
2024-09-10 05:07:40 +00:00
fc = commit --allow-empty -m 'feat: first commit'
2023-07-07 10:08:50 +00:00
fixom = !sh -c 'git fetch && git rebase -i --autosquash origin/$(git mainbranch)'
2021-05-06 12:46:45 +00:00
fixup = rebase -i --autosquash
2021-05-05 11:10:12 +00:00
l = log
2021-10-13 07:56:10 +00:00
l1 = log --oneline
2021-05-31 08:29:55 +00:00
ll = log --oneline -n 5
2021-09-28 17:52:33 +00:00
lp = log -p
2024-08-15 04:15:35 +00:00
lpme = logpme
2021-07-27 06:59:18 +00:00
lm = logme
logme = !sh -c 'git log --author=\"$(git config --get user.name)\"'
2024-08-15 04:15:35 +00:00
logpme = !sh -c 'git log -p --author=\"$(git config --get user.name)\"'
2023-09-17 05:33:28 +00:00
lrb = !git log $(git drb)
2021-05-06 12:46:45 +00:00
ls = !git branch --format '%(refname:short)' | fzf
2023-09-17 05:33:28 +00:00
ma = merge --abort
2023-07-07 10:08:50 +00:00
mainbranch = !gitmainbranch
2023-06-30 03:12:15 +00:00
mls = !git merge $(git ls)
2021-03-17 06:34:26 +00:00
mr = !git merge $(git rb)
2023-06-30 03:12:15 +00:00
mrb = mr
2021-05-21 19:52:42 +00:00
mt = merge -s recursive -X theirs
2021-04-22 09:41:53 +00:00
nb = checkout -b
2021-06-18 13:13:57 +00:00
nuke1 = reset --hard HEAD^
2021-03-17 06:34:26 +00:00
nuke = reset --hard
2021-04-13 15:59:03 +00:00
p = push
2023-10-03 06:47:56 +00:00
pf = push --force-with-lease
pff = push --force
2021-03-17 06:34:26 +00:00
pl = pull
plr = pull --rebase
2021-05-20 08:14:41 +00:00
ph = push -u origin HEAD
2021-10-20 14:23:27 +00:00
pr = dom
2023-07-07 10:08:50 +00:00
prs = !git diff --stat origin/$(git mainbranch)
2021-05-05 11:10:12 +00:00
ra = rebase --abort
2021-03-17 06:34:26 +00:00
rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u}
rc = rebase --continue
2021-05-05 11:10:12 +00:00
re = rebase
2021-10-13 07:56:10 +00:00
rels = !git rebase $(git branch | fzf)
2021-10-13 13:23:56 +00:00
ri = rebase -i --autosquash
2023-07-07 10:08:50 +00:00
rom = !sh -c 'git fetch && git rebase origin/$(git mainbranch)'
2021-07-21 09:12:56 +00:00
rr = !sh -c 'git fetch && git reset --hard $(git rb)'
2021-07-28 07:16:32 +00:00
rv = revert
rvh = revert HEAD
rvnh = revert -n HEAD
2021-03-17 06:34:26 +00:00
s = status
2021-12-16 22:32:12 +00:00
sh = show -p
2022-04-18 07:10:41 +00:00
sha = sy
2021-12-16 22:32:12 +00:00
shp = sh
2021-06-22 10:02:20 +00:00
sl = stash list
2021-03-26 16:24:46 +00:00
sq = merge --squash
2021-08-13 08:07:56 +00:00
sqls = !git sq $(git ls)
2021-06-18 13:13:57 +00:00
sqt = merge --squash -s recursive -X theirs
2021-03-18 08:05:37 +00:00
ss = stash save
2021-12-16 19:23:10 +00:00
st = stash
2024-03-10 20:30:11 +00:00
stus = stash --keep-index -u
2021-06-18 13:13:57 +00:00
sy = !gitsha1yank -s
sum = show --stat
2021-05-06 12:46:45 +00:00
sshp = stash show -p
2022-02-07 17:47:46 +00:00
undo = reset --soft HEAD^
wip = !git add . && git commit -m 'WIP'
2023-06-30 03:12:15 +00:00
wt = worktree
2021-03-15 14:18:21 +00:00
[user]
2021-03-17 06:34:26 +00:00
email = rob@netflux.io
name = Rob Watson
2021-03-15 14:18:21 +00:00
[core]
2021-06-22 04:24:37 +00:00
editor = nvim
2021-03-17 06:34:26 +00:00
quotePath = false
commitGraph = true
pager = delta
2024-05-20 13:37:33 +00:00
excludesFile = ~/.gitignore-global
2021-03-15 15:44:05 +00:00
[color]
2021-03-17 06:34:26 +00:00
ui = auto
2021-03-15 15:44:05 +00:00
[pull]
2021-03-17 06:34:26 +00:00
ff = only
2021-03-15 15:44:05 +00:00
[init]
2022-05-19 15:08:28 +00:00
defaultBranch = main
2021-03-15 14:18:21 +00:00
[credential "https://github.com"]
2021-03-17 06:34:26 +00:00
helper = !gh auth git-credential
2021-03-15 14:18:21 +00:00
[diff]
2024-12-03 03:18:30 +00:00
colorWords = true
2021-03-17 06:34:26 +00:00
tool = vimdiff
2024-11-11 07:43:47 +00:00
ignoreSubmodules = dirty
2021-03-15 14:18:21 +00:00
[merge]
2021-03-17 06:34:26 +00:00
tool = vimdiff
2024-12-03 03:18:30 +00:00
conflictstyle = zdiff3
2021-03-15 14:18:21 +00:00
[interactive]
2021-03-17 06:34:26 +00:00
diffFilter = delta --color-only
2021-03-15 14:18:21 +00:00
[delta]
2024-12-03 03:18:30 +00:00
navigate = true
dark = true
2021-03-17 06:34:26 +00:00
side-by-side = true
2021-03-29 13:09:50 +00:00
plus-style = 'syntax "#142e20"'
zero-style = 'syntax "#1d1f21" dim'
minus-style = 'syntax "#36181d"'
2021-03-17 06:34:26 +00:00
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
2024-12-03 03:18:30 +00:00
wrap-max-lines=unlimited
wrap-right-percent=1
wrap-left-symbol=" "