diff options
Diffstat (limited to 'git/config')
-rw-r--r-- | git/config | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/git/config b/git/config index 4ea5ba7..dbec691 100644 --- a/git/config +++ b/git/config | |||
@@ -1,92 +1,92 @@ | |||
1 | [user] | 1 | [user] |
2 | email = acdw@acdw.net | 2 | email = acdw@acdw.net |
3 | name = Case Duckworth | 3 | name = Case Duckworth |
4 | 4 | ||
5 | [init] | 5 | [init] |
6 | defaultBranch = main | 6 | defaultBranch = main |
7 | 7 | ||
8 | [push] | 8 | [push] |
9 | default = simple | 9 | default = simple |
10 | 10 | ||
11 | [pull] | 11 | [pull] |
12 | rebase = false | 12 | rebase = false |
13 | 13 | ||
14 | [core] | 14 | [core] |
15 | editor = vim | 15 | editor = emacsclient |
16 | precomposeunicode = true | 16 | precomposeunicode = true |
17 | pager = less | 17 | pager = less |
18 | autocrlf = false | 18 | autocrlf = false |
19 | eol = lf | 19 | eol = lf |
20 | 20 | ||
21 | [merge] | 21 | [merge] |
22 | conflictstyle = diff3 | 22 | conflictstyle = diff3 |
23 | tool = vimdiff | 23 | tool = vimdiff |
24 | 24 | ||
25 | [alias] | 25 | [alias] |
26 | # Easier locations | 26 | # Easier locations |
27 | root = rev-parse --show-toplevel | 27 | root = rev-parse --show-toplevel |
28 | current-branch = rev-parse --abbrev-ref HEAD | 28 | current-branch = rev-parse --abbrev-ref HEAD |
29 | # Easier listing and info | 29 | # Easier listing and info |
30 | branches = branch -a | 30 | branches = branch -a |
31 | tags = tag -l | 31 | tags = tag -l |
32 | stashes = stash list | 32 | stashes = stash list |
33 | remotes = remote -v | 33 | remotes = remote -v |
34 | staged = diff --cached | 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 | 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 | 36 | precommit = diff --cached --diff-algorithm=minimal -w |
37 | # Easier actions | 37 | # Easier actions |
38 | discard = checkout -- | 38 | discard = checkout -- |
39 | uncommit = reset --soft HEAD^ | 39 | uncommit = reset --soft HEAD^ |
40 | unstage = reset HEAD -- | 40 | unstage = reset HEAD -- |
41 | amend = commit --amend | 41 | amend = commit --amend |
42 | pushall = !git remote | xargs -L1 git push --all | 42 | pushall = !git remote | xargs -L1 git push --all |
43 | # Shortened commonalities | 43 | # Shortened commonalities |
44 | st = status -bs | 44 | st = status -bs |
45 | ac = !git add . && git commit -m | 45 | ac = !git add . && git commit -m |
46 | 46 | ||
47 | # diffing | 47 | # diffing |
48 | [diff "lisp"] | 48 | [diff "lisp"] |
49 | xfuncname = "^(\\(.*)$" | 49 | xfuncname = "^(\\(.*)$" |
50 | [diff "org"] | 50 | [diff "org"] |
51 | xfuncname = "^(\\*+.*)$" | 51 | xfuncname = "^(\\*+.*)$" |
52 | 52 | ||
53 | ; [credential] | 53 | ; [credential] |
54 | ; helper = /home/case/.local/bin/pass-git-helper | 54 | ; helper = /home/case/.local/bin/pass-git-helper |
55 | ; useHttpPath = true | 55 | ; useHttpPath = true |
56 | 56 | ||
57 | [bash] | 57 | [bash] |
58 | showUntrackedFiles = true | 58 | showUntrackedFiles = true |
59 | showDirtyState = true | 59 | showDirtyState = true |
60 | 60 | ||
61 | [sendemail] | 61 | [sendemail] |
62 | smtpserver = smtp.fastmail.com | 62 | smtpserver = smtp.fastmail.com |
63 | smtpuser = acdw@fastmail.com | 63 | smtpuser = acdw@fastmail.com |
64 | smtpencryption = tls | 64 | smtpencryption = tls |
65 | smtpserverport = 465 | 65 | smtpserverport = 465 |
66 | 66 | ||
67 | # Better urls | 67 | # Better urls |
68 | [url "https://github.com/"] | 68 | [url "https://github.com/"] |
69 | insteadOf = "gh:" | 69 | insteadOf = "gh:" |
70 | [url "git@github.com:"] | 70 | [url "git@github.com:"] |
71 | pushInsteadOf = "gh:" | 71 | pushInsteadOf = "gh:" |
72 | [github] | 72 | [github] |
73 | user = duckwork | 73 | user = duckwork |
74 | 74 | ||
75 | [url "https://gitlab.com/"] | 75 | [url "https://gitlab.com/"] |
76 | insteadOf = "gl:" | 76 | insteadOf = "gl:" |
77 | [url "git@gitlab.com:"] | 77 | [url "git@gitlab.com:"] |
78 | pushInsteadOf = "gl:" | 78 | pushInsteadOf = "gl:" |
79 | [gitlab] | 79 | [gitlab] |
80 | user = acdw | 80 | user = acdw |
81 | 81 | ||
82 | [url "https://git.sr.ht/"] | 82 | [url "https://git.sr.ht/"] |
83 | insteadOf = "sr:" | 83 | insteadOf = "sr:" |
84 | [url "git@git.sr.ht:"] | 84 | [url "git@git.sr.ht:"] |
85 | pushInsteadOf = "sr:" | 85 | pushInsteadOf = "sr:" |
86 | 86 | ||
87 | [url "https://tildegit.org/"] | 87 | [url "https://tildegit.org/"] |
88 | insteadOf = "tg:" | 88 | insteadOf = "tg:" |
89 | [url "git@tildegit.org:"] | 89 | [url "git@tildegit.org:"] |
90 | pushInsteadOf = "tg:" | 90 | pushInsteadOf = "tg:" |
91 | [gitea "tildegit.org/api/v1"] | 91 | [gitea "tildegit.org/api/v1"] |
92 | user = acdw | 92 | user = acdw |