.gitconfig

Sun, 18 Dec 2016 17:42:41 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Sun, 18 Dec 2016 17:42:41 -0500
changeset 454
e501f44a5885
parent 440
aacbd4032a4c
child 488
c986943c78ff
permissions
-rw-r--r--

set spideroak as 2nd wiki

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
251
308d12c05585 Add fsckobjects = true
Meredith Howard <mhoward@roomag.org>
parents: 229
diff changeset
5 [transfer]
308d12c05585 Add fsckobjects = true
Meredith Howard <mhoward@roomag.org>
parents: 229
diff changeset
6 fsckobjects = true
308d12c05585 Add fsckobjects = true
Meredith Howard <mhoward@roomag.org>
parents: 229
diff changeset
7
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
8 [ui]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
9 color = true
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
10
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
11 [core]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
12 pager = LESS='FSRX' less
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
13
336
a921d84589cf add diff.compactionheuristic = true
Meredith Howard <mhoward@roomag.org>
parents: 335
diff changeset
14 [diff]
a921d84589cf add diff.compactionheuristic = true
Meredith Howard <mhoward@roomag.org>
parents: 335
diff changeset
15 compactionheuristic = true
a921d84589cf add diff.compactionheuristic = true
Meredith Howard <mhoward@roomag.org>
parents: 335
diff changeset
16
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
17 [alias]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
18 ci = commit
207
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
19 rec = commit -p
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
20 unrec = checkout --patch
207
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
21 st = status -sb
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
22 co = checkout
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
23 br = branch
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
24 staged = diff --cached
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
25 unstage = reset HEAD --
310
6dd92510e2bd revert to update
Meredith Howard <mhoward@roomag.org>
parents: 307
diff changeset
26 update = "!git remote update -p && git merge --ff-only --stat @{u}"
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
27 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
28 out = "!git log --pretty=onelinecustom @{u}.."
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
29 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
30 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d"
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
31 glog = log --graph --pretty=onelinecustom
207
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
32 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\"' "$@"
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
33
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
34 [pretty]
229
0aefc3566070 terminate format with a newline
Meredith Howard <mhoward@roomag.org>
parents: 228
diff changeset
35 onelinecustom = tformat:%C(magenta)%h%Creset -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
36
166
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
37 [branch]
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
38 autosetuprebase = always
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
39 autosetupmerge = always
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
40
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
41 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
42 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
43
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
44 [rebase]
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
45 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
46
186
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
47 # 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
48 [include]
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
49 path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
50
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
51 # vim: noet:sw=8

mercurial