This repository has been archived on 2024-03-28. You can view files and clone it, but cannot push or open issues or pull requests.
dotfiles/apps/git/config
Daniel Flanagan 2dda9880d5
Squashed commit of the following:
commit 74cc8fa92e
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Fri Jan 24 12:45:49 2020 -0600

    MIC SCRIPT

commit dbd88dde4b
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Jan 23 12:38:19 2020 -0600

    Mic script, amd stuff, more fish fixes

commit dadb7da642
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Jan 23 09:51:03 2020 -0600

    Remove more generated fish stuff, more fixes

commit b09a25cc17
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Wed Jan 22 17:25:47 2020 -0600

    More fixes to various things

commit 58f6626280
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Wed Jan 22 08:34:12 2020 -0600

    Updates

commit 00e919f7f5
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 14:28:45 2020 -0600

    Fix notes and add vim pager

commit 5100983350
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 14:01:06 2020 -0600

    More fixes and cleanup

commit 85eab2155c
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 13:09:31 2020 -0600

    More notes

commit da496b7f0c
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 12:43:55 2020 -0600

    Maybe actually fix colors?

commit 3c11353256
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 12:32:23 2020 -0600

    Colors fixed?

commit f2a5060e7d
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 11:40:26 2020 -0600

    Things

commit f44d0d5479
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 10:54:09 2020 -0600

    Kitty colors

commit 5f0fa76a67
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 10:49:06 2020 -0600

    More updates for fish migration

commit 5b05be9fe7
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 09:14:08 2020 -0600

    Nah

commit fe0f1d8e32
Merge: 52fe38f 205c12a
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 09:13:09 2020 -0600

    Merge branch 'dev' of ssh://git.lyte.dev:2222/lytedev/dotfiles into dev

commit 52fe38f42a
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 20 09:12:52 2020 -0600

    More fish fixes

commit 205c12a051
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Sat Jan 18 23:15:13 2020 -0600

    WIP

commit b73c4b26a4
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Fri Jan 17 10:36:20 2020 -0600

    Remove debug code, fix asdf references for fish

commit d6ecaf88be
Merge: 2e6b90b 46793bb
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Fri Jan 17 10:34:01 2020 -0600

    Merge remote-tracking branch 'origin/lappy' into dev

commit 2e6b90bed3
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Fri Jan 17 10:26:00 2020 -0600

    Pulsemixer > pavucontrol and some sway fixes

commit 46793bb735
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Fri Jan 17 03:02:53 2020 -0600

    Whew

commit 26f32a0c6b
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Thu Jan 16 17:01:59 2020 -0600

    WIP fish configuration

commit fb0389eea4
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Thu Jan 16 13:30:35 2020 -0600

    Fiiiish

commit 2f1af8411a
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Thu Jan 16 13:28:23 2020 -0600

    Stuff

commit ba8ec1f524
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Thu Jan 9 19:02:31 2020 -0600

    Fix some dock stuff, erlang with wx

commit d80a823ce2
Merge: 36d58e0 5195a85
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Wed Jan 8 13:32:56 2020 -0600

    Merge remote-tracking branch 'origin/lappy' into wip-refactor

commit 36d58e037f
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Wed Jan 8 10:59:45 2020 -0600

    Testing signed commits

commit 5195a855a6
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Tue Jan 7 19:38:43 2020 -0600

    Bars

commit 1acb330746
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Tue Jan 7 11:36:12 2020 -0600

    SWAAAAAY

commit f547e5ec28
Merge: aa29acb b1709d1
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Tue Jan 7 10:59:24 2020 -0600

    Merge remote-tracking branch 'origin/wip-refactor' into lappy

commit b1709d1e94
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Tue Jan 7 10:59:22 2020 -0600

    Stuff

commit aa29acb364
Merge: 66cc873 2456dad
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Tue Jan 7 10:58:29 2020 -0600

    Merge remote-tracking branch 'origin/wip-refactor' into lappy

commit 2456dad7de
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Jan 6 11:15:30 2020 -0600

    Zstd

commit 66cc8734a8
Author: Daniel Flanagan <daniel@lyte.dev>
Date:   Tue Dec 31 21:48:49 2019 -0600

    Fix sudo setup and use fancy email for git

commit a05c02e1fb
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Tue Dec 31 17:03:22 2019 -0600

    Fancy colors

commit 026220fe26
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Tue Dec 31 16:55:45 2019 -0600

    SMTP tools

commit e2a854df65
Merge: 0d0e131 825d91b
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Tue Dec 31 15:07:09 2019 -0600

    Merge branch 'wip-refactor' into lappy

commit 0d0e131714
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Tue Dec 31 14:26:44 2019 -0600

    Stuff

commit 825d91b462
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Tue Dec 31 10:15:01 2019 -0600

    Utility updates

commit ae350894af
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Dec 30 10:02:14 2019 -0600

    Lul.

commit ea5debe38c
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Dec 16 17:21:44 2019 -0600

    WIP chat system

commit c40fe94b70
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Dec 16 09:57:21 2019 -0600

    Add weechat config

commit 76e8a68c34
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Dec 16 09:51:21 2019 -0600

    Preparing for weechat stuf

commit 25aecdc139
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Fri Dec 13 11:32:15 2019 -0600

    Goodies?

commit 8d1e86feb4
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Dec 12 13:31:18 2019 -0600

    Logging for pipelines?

commit b81bdf6abd
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Dec 12 13:17:20 2019 -0600

    errors break things?

commit 6f7d80d761
Merge: 7659442 bc5ce9e
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Dec 12 13:04:52 2019 -0600

    Merge branch 'master' of ssh://git.lyte.dev:2222/lytedev/dotfiles

commit 76594427ff
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Dec 12 13:00:03 2019 -0600

    Pipelines!

commit 972508e74d
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Dec 12 11:02:24 2019 -0600

    WIP pipeline

commit 898848669c
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Fri Dec 6 10:08:42 2019 -0600

    Archive

commit 16895af798
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Thu Dec 5 16:09:52 2019 -0600

    Helpful bins

commit 3a8eb5d475
Author: Daniel Flanagan <daniel@lytedev.io>
Date:   Mon Dec 2 09:31:28 2019 -0600

    Move a lot of stuff around
2020-01-24 12:46:51 -06:00

66 lines
1.2 KiB
Plaintext

[push]
default = current
[user]
name = Daniel Flanagan
email = daniel@lytedev.io
signingkey = daniel@lytedev.io
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[core]
editor = nvim
pager = less -r
[http "https://gopkg.in"]
followRedirects = true
[diff]
tool = nvimdiff
[difftool]
prompt = false
[alias]
d = difftool
s = status
co = checkout
mm = merge master
rim = rebase -i master
b = rev-parse --symbolic-full-name HEAD
p = push
pl = pull
pf = push --force-with-lease
a = add -A
cnv = commit --no-verify
canv = commit --no-verify
c = commit
[merge]
tool = nvimdiff
conflictstyle = diff3
[mergetool]
prompt = false
[mergetool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[pager]
branch = false
# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
diff = vimpager -c 'silent %sm/\\e[^mK]*[mK]//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent execute \"normal gg2dd\"'
[url "git@github.com:postmates"]
insteadOf = https://github.com/postmates
[commit]
gpgsign = true
[gpg]
program = gpg2