Tue, 12 Nov 2019 16:23:27 -0600
actually run cpm to make sure it's not a stub
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 | ||
93
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
8 | [alias] |
784 | 9 | alias = "!git config -l | grep -v 'alias.alias' | perl -ne 's/^alias\\.// and s/=/#= / and print' | column -t -s#" |
541 | 10 | ci = commit |
11 | rec = commit -p | |
12 | unrec = checkout --patch | |
13 | amend = commit -p --amend | |
14 | st = status -sb | |
15 | co = checkout | |
16 | br = branch | |
17 | staged = diff --cached | |
18 | unstage = reset HEAD -- | |
540
c51f6fc7c727
add rollback, more hg riffs!
Meredith Howard <mhoward@roomag.org>
parents:
531
diff
changeset
|
19 | rollback = reset --soft ^HEAD |
541 | 20 | up = pull -r --prune |
21 | update = "!git remote update -p && git merge --ff-only --stat @{u}" | |
22 | in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" | |
23 | out = "!git log --pretty=onelinecustom @{u}.." | |
24 | new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" | |
25 | cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d" | |
26 | glog = log --graph --pretty=onelinecustom | |
789 | 27 | 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
|
28 | |
792 | 29 | [pretty] |
30 | onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset | |
31 | ||
32 | [ui] | |
33 | color = true | |
34 | ||
35 | [core] | |
36 | pager = LESS=FSRXi less | |
37 | ||
38 | [gpg] | |
39 | program = "gpg2" | |
40 | ||
41 | [merge] | |
42 | tool = vimdiff2 | |
43 | ||
166
7d0c758c7a4d
default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents:
93
diff
changeset
|
44 | [branch] |
7d0c758c7a4d
default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents:
93
diff
changeset
|
45 | autosetuprebase = always |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
46 | autosetupmerge = always |
177 | 47 | |
629 | 48 | [commit] |
49 | verbose = true | |
50 | gpgsign = true | |
51 | ||
52 | [diff] | |
53 | compactionheuristic = true | |
54 | ||
177 | 55 | [push] |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
56 | default = current |
177 | 57 | |
58 | [rebase] | |
790 | 59 | autosquash = true |
177 | 60 | stat = true |
173
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
61 | |
791 | 62 | [rerere] |
63 | enabled = true | |
64 | autoupdate = true | |
65 | ||
629 | 66 | [transfer] |
67 | fsckobjects = true | |
494
d6d298c93437
I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents:
492
diff
changeset
|
68 | |
186 | 69 | # 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
|
70 | [include] |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
71 | path = ~/.gitconfig.local |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
72 | |
228
bf3429214b78
Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents:
212
diff
changeset
|
73 | # vim: noet:sw=8 |