Fri, 28 Aug 2020 12:19:34 -0500
new aliases: brd brf pushF
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 | 5 | [github] |
6 | user = merrilymeredith | |
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 | 12 | ci = commit |
13 | rec = commit -p | |
14 | unrec = checkout --patch | |
15 | amend = commit -p --amend | |
16 | st = status -sb | |
17 | co = checkout | |
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 | 21 | staged = diff --cached |
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 | 25 | up = pull -r --prune |
26 | update = "!git remote update -p && git merge --ff-only --stat @{u}" | |
27 | in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" | |
28 | out = "!git log --pretty=onelinecustom @{u}.." | |
29 | new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" | |
30 | cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" | |
31 | glog = log --graph --pretty=onelinecustom | |
789 | 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 | 34 | [pretty] |
35 | onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset | |
36 | ||
37 | [ui] | |
38 | color = true | |
39 | ||
40 | [core] | |
41 | pager = LESS=FSRXi less | |
42 | ||
43 | [gpg] | |
44 | program = "gpg2" | |
45 | ||
46 | [merge] | |
881 | 47 | tool = vimdiff3 |
48 | guitool = gvimdiff | |
49 | conflictstyle = diff3 | |
792 | 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 | 54 | |
629 | 55 | [commit] |
56 | verbose = true | |
57 | gpgsign = true | |
58 | ||
59 | [diff] | |
60 | compactionheuristic = true | |
61 | ||
177 | 62 | [push] |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
63 | default = current |
177 | 64 | |
65 | [rebase] | |
66 | stat = true | |
173
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
67 | |
791 | 68 | [rerere] |
69 | autoupdate = true | |
70 | ||
629 | 71 | [transfer] |
72 | fsckobjects = true | |
494
d6d298c93437
I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents:
492
diff
changeset
|
73 | |
186 | 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 |