.gitconfig

Sat, 26 Sep 2020 15:32:52 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Sat, 26 Sep 2020 15:32:52 -0500
changeset 886
625e5b7d33fb
parent 882
e87f11edf6e0
child 891
7947270fa776
permissions
-rw-r--r--

move polyglot_disabled earlier

93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
1 [user]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
2 email = mhoward@roomag.org
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
3 name = Meredith Howard
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
4
721
947e5acdd37a add github.user
Meredith Howard <mhoward@roomag.org>
parents: 629
diff changeset
5 [github]
947e5acdd37a add github.user
Meredith Howard <mhoward@roomag.org>
parents: 629
diff changeset
6 user = merrilymeredith
947e5acdd37a add github.user
Meredith Howard <mhoward@roomag.org>
parents: 629
diff changeset
7
879
34cddeee4d77 init.defaultBranch = main
Meredith Howard <mhoward@roomag.org>
parents: 858
diff changeset
8 [init]
34cddeee4d77 init.defaultBranch = main
Meredith Howard <mhoward@roomag.org>
parents: 858
diff changeset
9 defaultBranch = main
34cddeee4d77 init.defaultBranch = main
Meredith Howard <mhoward@roomag.org>
parents: 858
diff changeset
10
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
11 [alias]
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
12 ci = commit
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
13 rec = commit -p
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
14 unrec = checkout --patch
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
15 amend = commit -p --amend
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
16 st = status -sb
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
17 co = checkout
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
18 br = branch
882
e87f11edf6e0 new aliases: brd brf pushF
Meredith Howard <mhoward@roomag.org>
parents: 881
diff changeset
19 brd = diff @{u}..
e87f11edf6e0 new aliases: brd brf pushF
Meredith Howard <mhoward@roomag.org>
parents: 881
diff changeset
20 brf = diff --name-only @{u}..
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
21 staged = diff --cached
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
22 unstage = reset HEAD --
540
c51f6fc7c727 add rollback, more hg riffs!
Meredith Howard <mhoward@roomag.org>
parents: 531
diff changeset
23 rollback = reset --soft ^HEAD
882
e87f11edf6e0 new aliases: brd brf pushF
Meredith Howard <mhoward@roomag.org>
parents: 881
diff changeset
24 pushF = push --force-with-lease
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
25 up = pull -r --prune
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
26 update = "!git remote update -p && git merge --ff-only --stat @{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
28 out = "!git log --pretty=onelinecustom @{u}.."
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
29 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
30 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
31 glog = log --graph --pretty=onelinecustom
789
2d470b528b53 improve git-recent
Meredith Howard <mhoward@roomag.org>
parents: 784
diff changeset
32 recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f"
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
33
792
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
34 [pretty]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
35 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
36
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
37 [ui]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
38 color = true
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
39
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
40 [core]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
41 pager = LESS=FSRXi less
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
42
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
43 [gpg]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
44 program = "gpg2"
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
45
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
46 [merge]
881
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 880
diff changeset
47 tool = vimdiff3
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 880
diff changeset
48 guitool = gvimdiff
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 880
diff changeset
49 conflictstyle = diff3
792
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
50
166
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
51 [branch]
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
52 autosetuprebase = always
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
53 autosetupmerge = always
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
54
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
55 [commit]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
56 verbose = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
57 gpgsign = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
58
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
59 [diff]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
60 compactionheuristic = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
61
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
62 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
63 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
64
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
65 [rebase]
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
66 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
67
791
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
68 [rerere]
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
69 autoupdate = true
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
70
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
71 [transfer]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
72 fsckobjects = true
494
d6d298c93437 I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents: 492
diff changeset
73
186
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
74 # 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
75 [include]
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
76 path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
77
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
78 # vim: noet:sw=8

mercurial