Tue, 02 May 2023 17:34:25 -0500
stub reply
1089
81b964cde5b9
Cleaner conflict resolution
Meredith Howard <mhoward@roomag.org>
parents:
1028
diff
changeset
|
1 | # vim: noet:ts=8:sw=8 |
93
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
2 | [user] |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
3 | email = mhoward@roomag.org |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
4 | name = Meredith Howard |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
5 | |
721 | 6 | [github] |
7 | user = merrilymeredith | |
8 | ||
879
34cddeee4d77
init.defaultBranch = main
Meredith Howard <mhoward@roomag.org>
parents:
858
diff
changeset
|
9 | [init] |
34cddeee4d77
init.defaultBranch = main
Meredith Howard <mhoward@roomag.org>
parents:
858
diff
changeset
|
10 | defaultBranch = main |
34cddeee4d77
init.defaultBranch = main
Meredith Howard <mhoward@roomag.org>
parents:
858
diff
changeset
|
11 | |
93
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
12 | [alias] |
936 | 13 | ci = commit |
14 | rec = commit -p | |
15 | unrec = checkout --patch | |
16 | amend = commit -p --amend | |
17 | st = status -sb | |
18 | co = checkout | |
19 | br = branch | |
973 | 20 | brd = diff @{u}... |
21 | brf = diff --name-only @{u}... | |
936 | 22 | staged = diff --cached |
23 | unstage = reset HEAD -- | |
24 | rollback = reset --soft ^HEAD | |
961
68baaab84a0c
Make git-histedit an alias. can use --keep-base after 2.24
Meredith Howard <mhoward@roomag.org>
parents:
936
diff
changeset
|
25 | histedit = rebase -i --autosquash --onto @{u}... @{u} |
936 | 26 | pushf = push --force-with-lease |
997
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
27 | up = pull |
936 | 28 | update = "!git remote update -p && git merge --ff-only --stat @{u}" |
29 | in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" | |
30 | out = "!git log --pretty=onelinecustom @{u}.." | |
31 | new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" | |
32 | glog = log --graph --pretty=onelinecustom | |
33 | recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f" | |
34 | orphan = "!f() { git fsck --dangling | grep commit | cut -d' ' -f3 | xargs git show --compact-summary; }; f" | |
935 | 35 | fork-point = merge-base --fork-point @{u} |
228
bf3429214b78
Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents:
212
diff
changeset
|
36 | |
792 | 37 | [pretty] |
38 | onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset | |
39 | ||
40 | [ui] | |
41 | color = true | |
42 | ||
43 | [core] | |
44 | pager = LESS=FSRXi less | |
45 | ||
46 | [gpg] | |
47 | program = "gpg2" | |
48 | ||
49 | [merge] | |
881 | 50 | tool = vimdiff3 |
51 | guitool = gvimdiff | |
52 | conflictstyle = diff3 | |
792 | 53 | |
1089
81b964cde5b9
Cleaner conflict resolution
Meredith Howard <mhoward@roomag.org>
parents:
1028
diff
changeset
|
54 | [mergetool] |
81b964cde5b9
Cleaner conflict resolution
Meredith Howard <mhoward@roomag.org>
parents:
1028
diff
changeset
|
55 | keepBackup = false |
81b964cde5b9
Cleaner conflict resolution
Meredith Howard <mhoward@roomag.org>
parents:
1028
diff
changeset
|
56 | hideResolved = true |
81b964cde5b9
Cleaner conflict resolution
Meredith Howard <mhoward@roomag.org>
parents:
1028
diff
changeset
|
57 | |
166
7d0c758c7a4d
default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents:
93
diff
changeset
|
58 | [branch] |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
59 | autosetupmerge = always |
177 | 60 | |
629 | 61 | [commit] |
62 | verbose = true | |
63 | gpgsign = true | |
64 | ||
65 | [diff] | |
66 | compactionheuristic = true | |
67 | ||
997
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
68 | [pull] |
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
69 | rebase = true |
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
70 | |
177 | 71 | [push] |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
72 | default = current |
177 | 73 | |
997
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
74 | [fetch] |
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
75 | prune = true |
173
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
76 | |
997
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
77 | [rebase] |
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
78 | autostash = true |
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
79 | stat = true |
791 | 80 | |
629 | 81 | [transfer] |
1028
77e65ab97892
fsckobjects has also been a nuisance. maybe git just isn't great at integrity!
Meredith Howard <mhoward@roomag.org>
parents:
997
diff
changeset
|
82 | fsckobjects = false |
997
9e1ec7624f59
Update for newer configs, use autostash
Meredith Howard <mhoward@roomag.org>
parents:
973
diff
changeset
|
83 | |
918
09aadfdbc7dd
fsck sucks without these. i'm so tired. git please
Meredith Howard <mhoward@roomag.org>
parents:
916
diff
changeset
|
84 | [fetch "fsck"] |
09aadfdbc7dd
fsck sucks without these. i'm so tired. git please
Meredith Howard <mhoward@roomag.org>
parents:
916
diff
changeset
|
85 | zeroPaddedFilemode = ignore |
09aadfdbc7dd
fsck sucks without these. i'm so tired. git please
Meredith Howard <mhoward@roomag.org>
parents:
916
diff
changeset
|
86 | badDate = ignore |
09aadfdbc7dd
fsck sucks without these. i'm so tired. git please
Meredith Howard <mhoward@roomag.org>
parents:
916
diff
changeset
|
87 | badTimezone = ignore |
494
d6d298c93437
I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents:
492
diff
changeset
|
88 | |
186 | 89 | # include.path is available in git 1.7.10 and later |
173
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
90 | [include] |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
91 | path = ~/.gitconfig.local |