Skip to content

Commit

Permalink
reinstate this repo
Browse files Browse the repository at this point in the history
  • Loading branch information
darkwater committed Mar 12, 2022
1 parent 8e6b606 commit 684e777
Show file tree
Hide file tree
Showing 12 changed files with 636 additions and 17,423 deletions.
96 changes: 0 additions & 96 deletions .config/compton.conf

This file was deleted.

83 changes: 32 additions & 51 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,58 +1,39 @@
[user]
name = Sam Lakerveld
email = [email protected]
[core]
editor = nvim
excludesfile = /home/dark/.gitignore_global
[push]
default = simple
[color]
ui = true
[alias]
fuck-it = reset --hard
fuck-it-all = "!git fuck-it && git clean -fdx"
email = [email protected]
name = Sam Lakerveld

push-wip = "!. ~/.githelpers && push_wip"
pull-wip = "!. ~/.githelpers && pull_wip"
[commit]
gpgsign = yes

st = status
ci = commit --verbose
co = checkout
di = diff
dc = diff --cached
dt = difftool
amend = commit --amend
aa = add --all
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
fa = fetch --all
pom = push origin master
b = branch
ds = diff --stat=160,120
dh1 = diff HEAD~1
[init]
defaultBranch = master

# Divergence (commits we added and commits remote added)
div = divergence
[alias]
a = "add --all"
aa = "add --all"
ca = "commit --all --verbose"
c = "commit --verbose"
ci = "commit --verbose"
co = "checkout"
d = "diff"
di = "diff"
dc = "diff --cached"
s = "status"
st = "status"
l = "log --oneline --graph"
pou = "push -u origin"

# Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
[pager]
diff = delta
log = delta
reflog = delta
show = delta

# Fancy logging.
# h = head
# hp = head with patch
# r = recent commits, only current branch
# ra = recent commits, all reachable refs
# l = all commits, only current branch
# la = all commits, all reachable refs
head = !git r -1
h = !git head
hp = "!. ~/.githelpers && show_git_head"
r = !GIT_NO_PAGER=1 git l "-$(($(tput lines) / 6))"
ra = !git r --all
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
[delta]
plus-style = "syntax #012800"
minus-style = "syntax #340001"
syntax-theme = Monokai Extended
navigate = true

[merge]
tool = vimdiff
[interactive]
diffFilter = delta --color-only
61 changes: 0 additions & 61 deletions .githelpers

This file was deleted.

3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

Loading

0 comments on commit 684e777

Please sign in to comment.