.gitconfig

Sat, 08 Apr 2023 14:18:17 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Sat, 08 Apr 2023 14:18:17 -0500
changeset 1102
33dd24d2b740
parent 1089
81b964cde5b9
permissions
-rw-r--r--

help -> vimdoc

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
947e5acdd37a add github.user
Meredith Howard <mhoward@roomag.org>
parents: 629
diff changeset
6 [github]
947e5acdd37a add github.user
Meredith Howard <mhoward@roomag.org>
parents: 629
diff changeset
7 user = merrilymeredith
947e5acdd37a add github.user
Meredith Howard <mhoward@roomag.org>
parents: 629
diff changeset
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
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
13 ci = commit
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
14 rec = commit -p
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
15 unrec = checkout --patch
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
16 amend = commit -p --amend
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
17 st = status -sb
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
18 co = checkout
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
19 br = branch
973
20158142fa43 fix brd/brf aliases
Meredith Howard <mhoward@roomag.org>
parents: 961
diff changeset
20 brd = diff @{u}...
20158142fa43 fix brd/brf aliases
Meredith Howard <mhoward@roomag.org>
parents: 961
diff changeset
21 brf = diff --name-only @{u}...
936
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
22 staged = diff --cached
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
23 unstage = reset HEAD --
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
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
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
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
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
28 update = "!git remote update -p && git merge --ff-only --stat @{u}"
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
29 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
30 out = "!git log --pretty=onelinecustom @{u}.."
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
31 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
32 glog = log --graph --pretty=onelinecustom
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
33 recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f"
Meredith Howard <mhoward@roomag.org>
parents: 935
diff changeset
34 orphan = "!f() { git fsck --dangling | grep commit | cut -d' ' -f3 | xargs git show --compact-summary; }; f"
935
17d8ea40fb15 add fork-point alias
Meredith Howard <mhoward@roomag.org>
parents: 918
diff changeset
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
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
37 [pretty]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
38 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
39
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
40 [ui]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
41 color = true
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
42
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
43 [core]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
44 pager = LESS=FSRXi less
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
45
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
46 [gpg]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
47 program = "gpg2"
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
48
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
49 [merge]
881
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 880
diff changeset
50 tool = vimdiff3
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 880
diff changeset
51 guitool = gvimdiff
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 880
diff changeset
52 conflictstyle = diff3
792
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
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
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
60
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
61 [commit]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
62 verbose = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
63 gpgsign = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
64
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
65 [diff]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
66 compactionheuristic = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
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
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
71 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
72 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
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
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
80
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
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
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
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

mercurial