.gitconfig

Thu, 06 Jul 2017 01:30:49 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Thu, 06 Jul 2017 01:30:49 -0400
changeset 617
595c6f803258
parent 612
7b075a4427d8
child 629
c11c253374ac
permissions
-rw-r--r--

simplify

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
531
5c9cdf7fa512 Ignore timezone issues
Meredith Howard <mhoward@roomag.org>
parents: 522
diff changeset
8 [fsck]
5c9cdf7fa512 Ignore timezone issues
Meredith Howard <mhoward@roomag.org>
parents: 522
diff changeset
9 badTimezone = ignore
5c9cdf7fa512 Ignore timezone issues
Meredith Howard <mhoward@roomag.org>
parents: 522
diff changeset
10
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
11 [ui]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
12 color = true
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
13
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
14 [core]
506
2a6899f40b2e smartcase please
Meredith Howard <mhoward@roomag.org>
parents: 497
diff changeset
15 pager = LESS='FSRXi' less
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
16
336
a921d84589cf add diff.compactionheuristic = true
Meredith Howard <mhoward@roomag.org>
parents: 335
diff changeset
17 [diff]
a921d84589cf add diff.compactionheuristic = true
Meredith Howard <mhoward@roomag.org>
parents: 335
diff changeset
18 compactionheuristic = true
a921d84589cf add diff.compactionheuristic = true
Meredith Howard <mhoward@roomag.org>
parents: 335
diff changeset
19
612
7b075a4427d8 mergetools
Meredith Howard <mhoward@roomag.org>
parents: 548
diff changeset
20 [merge]
7b075a4427d8 mergetools
Meredith Howard <mhoward@roomag.org>
parents: 548
diff changeset
21 tool = vimdiff2
7b075a4427d8 mergetools
Meredith Howard <mhoward@roomag.org>
parents: 548
diff changeset
22
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
23 [alias]
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
24 ci = commit
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
25 rec = commit -p
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
26 unrec = checkout --patch
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
27 amend = commit -p --amend
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
28 st = status -sb
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
29 co = checkout
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
30 br = branch
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
31 staged = diff --cached
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
32 unstage = reset HEAD --
540
c51f6fc7c727 add rollback, more hg riffs!
Meredith Howard <mhoward@roomag.org>
parents: 531
diff changeset
33 rollback = reset --soft ^HEAD
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
34 up = pull -r --prune
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
35 update = "!git remote update -p && git merge --ff-only --stat @{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
36 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
37 out = "!git log --pretty=onelinecustom @{u}.."
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
38 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
39 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
40 glog = log --graph --pretty=onelinecustom
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
41 recent = !sh -c 'git for-each-ref --count=${1:-20} --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${@:2}' -
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
42
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
43 [pretty]
497
5df02ebeedf9 Tweak pretty fmt
Meredith Howard <mhoward@roomag.org>
parents: 496
diff changeset
44 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%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
45
166
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
46 [branch]
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
47 autosetuprebase = always
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
48 autosetupmerge = always
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
49
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
50 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
51 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
52
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
53 [rebase]
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
54 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
55
494
d6d298c93437 I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents: 492
diff changeset
56 [commit]
542
c78ff4777bd9 try global signing
Meredith Howard <mhoward@roomag.org>
parents: 541
diff changeset
57 verbose = true
c78ff4777bd9 try global signing
Meredith Howard <mhoward@roomag.org>
parents: 541
diff changeset
58 gpgsign = true
494
d6d298c93437 I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents: 492
diff changeset
59
548
e34f183fbd55 Make sure git sticks to gpg2
Meredith Howard <mhoward@roomag.org>
parents: 542
diff changeset
60 [gpg]
e34f183fbd55 Make sure git sticks to gpg2
Meredith Howard <mhoward@roomag.org>
parents: 542
diff changeset
61 program = "gpg2"
e34f183fbd55 Make sure git sticks to gpg2
Meredith Howard <mhoward@roomag.org>
parents: 542
diff changeset
62
186
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
63 # 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
64 [include]
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
65 path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
66
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
67 # vim: noet:sw=8

mercurial