diff options
| author | Case Duckworth | 2021-08-23 23:07:31 -0500 |
|---|---|---|
| committer | Case Duckworth | 2021-08-23 23:07:31 -0500 |
| commit | e292eb508413b9174684a8e75c93474a7f5351ee (patch) | |
| tree | e7e59b21c817bfd1c438ef3cfc68b9021e786d7c /git | |
| download | etc-e292eb508413b9174684a8e75c93474a7f5351ee.tar.gz etc-e292eb508413b9174684a8e75c93474a7f5351ee.zip | |
Initial
Diffstat (limited to 'git')
| -rw-r--r-- | git/attributes | 3 | ||||
| -rw-r--r-- | git/config | 90 | ||||
| -rw-r--r-- | git/ignore | 3 |
3 files changed, 96 insertions, 0 deletions
| diff --git a/git/attributes b/git/attributes new file mode 100644 index 0000000..a5516e5 --- /dev/null +++ b/git/attributes | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | *.lisp diff=lisp | ||
| 2 | *.el diff=lisp | ||
| 3 | *.org diff=org | ||
| diff --git a/git/config b/git/config new file mode 100644 index 0000000..cad9e12 --- /dev/null +++ b/git/config | |||
| @@ -0,0 +1,90 @@ | |||
| 1 | [user] | ||
| 2 | email = acdw@acdw.net | ||
| 3 | name = Case Duckworth | ||
| 4 | |||
| 5 | [init] | ||
| 6 | defaultBranch = main | ||
| 7 | |||
| 8 | [push] | ||
| 9 | default = simple | ||
| 10 | |||
| 11 | [pull] | ||
| 12 | rebase = false | ||
| 13 | |||
| 14 | [core] | ||
| 15 | editor = vim | ||
| 16 | precomposeunicode = true | ||
| 17 | pager = less | ||
| 18 | autocrlf = false | ||
| 19 | eol = lf | ||
| 20 | |||
| 21 | [merge] | ||
| 22 | conflictstyle = diff3 | ||
| 23 | tool = vimdiff | ||
| 24 | |||
| 25 | [alias] | ||
| 26 | # Easier locations | ||
| 27 | root = rev-parse --show-toplevel | ||
| 28 | current-branch = rev-parse --abbrev-ref HEAD | ||
| 29 | # Easier listing and info | ||
| 30 | branches = branch -a | ||
| 31 | tags = tag -l | ||
| 32 | stashes = stash list | ||
| 33 | remotes = remote -v | ||
| 34 | staged = diff --cached | ||
| 35 | graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset: %<(75,trunc)%s (%cN, %cr) %Cred%d' --date-order | ||
| 36 | precommit = diff --cached --diff-algorithm=minimal -w | ||
| 37 | # Easier actions | ||
| 38 | discard = checkout -- | ||
| 39 | uncommit = reset --soft HEAD^ | ||
| 40 | unstage = reset HEAD -- | ||
| 41 | amend = commit --amend | ||
| 42 | pushall = !git remote | xargs -L1 git push --all | ||
| 43 | # Shortened commonalities | ||
| 44 | st = status -bs | ||
| 45 | ac = !git add . && git commit -m | ||
| 46 | |||
| 47 | # diffing | ||
| 48 | [diff "lisp"] | ||
| 49 | xfuncname = "^(\\(.*)$" | ||
| 50 | [diff "org"] | ||
| 51 | xfuncname = "^(\\*+.*)$" | ||
| 52 | |||
| 53 | ; [credential] | ||
| 54 | ; helper = /home/case/.local/bin/pass-git-helper | ||
| 55 | ; useHttpPath = true | ||
| 56 | |||
| 57 | [bash] | ||
| 58 | showUntrackedFiles = true | ||
| 59 | showDirtyState = true | ||
| 60 | |||
| 61 | [sendemail] | ||
| 62 | smtpserver = smtp.fastmail.com | ||
| 63 | smtpuser = acdw@fastmail.com | ||
| 64 | smtpencryption = tls | ||
| 65 | smtpserverport = 465 | ||
| 66 | |||
| 67 | # Better urls | ||
| 68 | [url "https://github.com/"] | ||
| 69 | insteadOf = "gh:" | ||
| 70 | [url "git@github.com:"] | ||
| 71 | pushInsteadOf = "gh:" | ||
| 72 | [github] | ||
| 73 | user = duckwork | ||
| 74 | |||
| 75 | [url "https://gitlab.com/"] | ||
| 76 | insteadOf = "gl:" | ||
| 77 | [url "git@gitlab.com:"] | ||
| 78 | pushInsteadOf = "gl:" | ||
| 79 | [gitlab] | ||
| 80 | user = acdw | ||
| 81 | |||
| 82 | [url "https://git.sr.ht/"] | ||
| 83 | insteadOf = "sr:" | ||
| 84 | [url "git@git.sr.ht:"] | ||
| 85 | pushInsteadOf = "sr:" | ||
| 86 | |||
| 87 | [url "https://tildegit.org/"] | ||
| 88 | insteadOf = "tg:" | ||
| 89 | [url "git@tildegit.org:"] | ||
| 90 | pushInsteadOf = "tg:" | ||
| diff --git a/git/ignore b/git/ignore new file mode 100644 index 0000000..6a4c747 --- /dev/null +++ b/git/ignore | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | *.sw? | ||
| 2 | *~ | ||
| 3 | .DS\_Store | ||