.gitconfig

Tue, 12 Nov 2019 16:23:27 -0600

author
Meredith Howard <mhoward@roomag.org>
date
Tue, 12 Nov 2019 16:23:27 -0600
changeset 819
58f9d9741852
parent 792
2693c3ccb0da
child 843
7968d9507ddb
permissions
-rw-r--r--

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
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
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
8 [alias]
784
a97d39955d73 add "alias" aliases
Meredith Howard <mhoward@roomag.org>
parents: 737
diff changeset
9 alias = "!git config -l | grep -v 'alias.alias' | perl -ne 's/^alias\\.// and s/=/#= / and print' | column -t -s#"
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
10 ci = commit
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
11 rec = commit -p
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
12 unrec = checkout --patch
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
13 amend = commit -p --amend
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
14 st = status -sb
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
15 co = checkout
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
16 br = branch
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
17 staged = diff --cached
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
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
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
20 up = pull -r --prune
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
21 update = "!git remote update -p && git merge --ff-only --stat @{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
22 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
23 out = "!git log --pretty=onelinecustom @{u}.."
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
24 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
25 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
26 glog = log --graph --pretty=onelinecustom
789
2d470b528b53 improve git-recent
Meredith Howard <mhoward@roomag.org>
parents: 784
diff changeset
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
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
29 [pretty]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
30 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
31
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
32 [ui]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
33 color = true
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
34
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
35 [core]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
36 pager = LESS=FSRXi less
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
37
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
38 [gpg]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
39 program = "gpg2"
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
40
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
41 [merge]
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
42 tool = vimdiff2
2693c3ccb0da rearrange
Meredith Howard <mhoward@roomag.org>
parents: 791
diff changeset
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
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
47
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
48 [commit]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
49 verbose = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
50 gpgsign = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
51
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
52 [diff]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
53 compactionheuristic = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
54
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
55 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
56 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
57
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
58 [rebase]
790
5ecabaf00ed2 set rebase.autosquash
Meredith Howard <mhoward@roomag.org>
parents: 789
diff changeset
59 autosquash = true
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
60 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
61
791
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
62 [rerere]
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
63 enabled = true
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
64 autoupdate = true
5b1ae7f6ee1e add global rerere
Meredith Howard <mhoward@roomag.org>
parents: 790
diff changeset
65
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
66 [transfer]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
67 fsckobjects = true
494
d6d298c93437 I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents: 492
diff changeset
68
186
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
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

mercurial