diff options
Diffstat (limited to 'user/git')
-rw-r--r-- | user/git/.config/git/config | 67 | ||||
-rw-r--r-- | user/git/.config/git/config-satoshipay | 2 | ||||
-rw-r--r-- | user/git/.config/git/gitk | 61 | ||||
-rw-r--r-- | user/git/.config/git/ignore | 34 |
4 files changed, 0 insertions, 164 deletions
diff --git a/user/git/.config/git/config b/user/git/.config/git/config deleted file mode 100644 index 63b7e678..00000000 --- a/user/git/.config/git/config +++ /dev/null @@ -1,67 +0,0 @@ -[user] - email = alan@alanpearce.eu - name = Alan Pearce - signingkey = 0xAE8625A63F6F8FD5 -[color] - branch = auto - diff = auto - status = auto - ui = true -[pull] - rebase = true -[push] - default = current - followTags = true -[alias] - up = merge FETCH_HEAD - st = status -sb - ci = commit - br = branch - co = checkout - lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\?[0-9]\" | tail -n1'" - pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'" - lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset' - prl = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset' --grep="#" - ignored = ls-files --others -i --exclude-standard - bump = !bmpr -[github] - user = alanpearce -[ghq "ssh://alanpearce.eu/"] - vcs = git -[includeIf "gitdir:~/projects/github.com/satoshipay/"] - path = config-satoshipay -[includeIf "gitdir:~/projects/gitlab.satoshipay.tech/"] - path = config-satoshipay -[diff] - algorithm = patience -[include] - path = config.local -[rebase] - autosquash = true -[rerere] - enabled = true -[diff] - tool = icdiff -[difftool] - prompt = false -[difftool "icdiff"] - cmd = icdiff --line-numbers $LOCAL $REMOTE -[diff "sopsdiffer"] - textconv = sops -d -[gpg] - program = gpg - -[merge "npm-merge-driver"] - name = automatically merge npm lockfiles - driver = npx npm-merge-driver merge %A %O %B %P -[remote] - autoSetupMerge = always -[branch "master"] - rebase = false -[url "ssh://git@gitlab.satoshipay.tech/"] - insteadOf = sp: -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true diff --git a/user/git/.config/git/config-satoshipay b/user/git/.config/git/config-satoshipay deleted file mode 100644 index 5fedb7d6..00000000 --- a/user/git/.config/git/config-satoshipay +++ /dev/null @@ -1,2 +0,0 @@ -[user] -email = alan@satoshipay.io \ No newline at end of file diff --git a/user/git/.config/git/gitk b/user/git/.config/git/gitk deleted file mode 100644 index 0eb9a033..00000000 --- a/user/git/.config/git/gitk +++ /dev/null @@ -1,61 +0,0 @@ -set mainfont {{Lucida Grande} 12} -set textfont {Monaco 12} -set uifont {{Lucida Grande} 12 bold} -set tabstop 4 -set findmergefiles 0 -set maxgraphpct 50 -set maxwidth 16 -set cmitmode patch -set wrapcomment none -set autoselect 1 -set autosellen 40 -set showneartags 1 -set maxrefs 20 -set hideremotes 0 -set showlocalchanges 1 -set datetimeformat {%Y-%m-%d %H:%M:%S} -set limitdiffs 1 -set uicolor grey85 -set want_ttk 1 -set bgcolor white -set fgcolor black -set uifgcolor black -set uifgdisabledcolor #999 -set colors {green red blue magenta darkgrey brown orange} -set diffcolors {red "#00a000" blue} -set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} -set markbgcolor #e0e0ff -set diffcontext 3 -set selectbgcolor gray85 -set foundbgcolor yellow -set currentsearchhitbgcolor orange -set extdifftool opendiff -set perfile_attrs 0 -set headbgcolor green -set headfgcolor black -set headoutlinecolor black -set remotebgcolor #ffddaa -set tagbgcolor yellow -set tagfgcolor black -set tagoutlinecolor black -set reflinecolor black -set filesepbgcolor #aaaaaa -set filesepfgcolor black -set linehoverbgcolor #ffff80 -set linehoverfgcolor black -set linehoveroutlinecolor black -set mainheadcirclecolor yellow -set workingfilescirclecolor red -set indexcirclecolor green -set circlecolors {white blue gray blue blue} -set linkfgcolor blue -set circleoutlinecolor black -set geometry(main) 1477x845+26+50 -set geometry(state) normal -set geometry(topwidth) 1477 -set geometry(topheight) 300 -set geometry(pwsash0) "378 1" -set geometry(pwsash1) "569 1" -set geometry(botwidth) 473 -set geometry(botheight) 675 -set permviews {} diff --git a/user/git/.config/git/ignore b/user/git/.config/git/ignore deleted file mode 100644 index f51b56ed..00000000 --- a/user/git/.config/git/ignore +++ /dev/null @@ -1,34 +0,0 @@ -.git - -.DS_Store -.AppleDouble -.LSOverride -Icon -Desktop.ini - -# Thumbnails -._* -Thumbs.db - -# Emacs -*~ -\#*\# -/.emacs.desktop -/.emacs.desktop.lock -.elc -auto-save-list -tramp -.\#* - -# zsh -*.zwc - -# Org-mode -.org-id-locations -*_archive - -GPATH -GRTAGS -GTAGS - -.tern-port |