.gitconfig

Wed, 27 Sep 2017 18:45:35 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Wed, 27 Sep 2017 18:45:35 -0400
changeset 648
2918ff726641
parent 629
c11c253374ac
child 721
947e5acdd37a
permissions
-rw-r--r--

fix new window activation

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
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
5 [alias]
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
6 ci = commit
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
7 rec = commit -p
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
8 unrec = checkout --patch
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
9 amend = commit -p --amend
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
10 st = status -sb
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
11 co = checkout
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
12 br = branch
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
13 staged = diff --cached
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
14 unstage = reset HEAD --
540
c51f6fc7c727 add rollback, more hg riffs!
Meredith Howard <mhoward@roomag.org>
parents: 531
diff changeset
15 rollback = reset --soft ^HEAD
541
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
16 up = pull -r --prune
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
17 update = "!git remote update -p && git merge --ff-only --stat @{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
18 in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
19 out = "!git log --pretty=onelinecustom @{u}.."
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
20 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
21 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
22 glog = log --graph --pretty=onelinecustom
34fe07d0aa0e realign
Meredith Howard <mhoward@roomag.org>
parents: 540
diff changeset
23 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
24
166
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
25 [branch]
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
26 autosetuprebase = always
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
27 autosetupmerge = always
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
28
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
29 [commit]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
30 verbose = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
31 gpgsign = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
32
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
33 [core]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
34 pager = LESS='FSRXi' less
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
35
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
36 [diff]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
37 compactionheuristic = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
38
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
39 [fsck]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
40 badTimezone = ignore
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
41
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
42 [gpg]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
43 program = "gpg2"
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
44
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
45 [merge]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
46 tool = vimdiff2
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
47
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
48 [pretty]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
49 onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
50
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
51 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
52 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
53
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
54 [rebase]
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
55 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
56
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
57 [transfer]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
58 fsckobjects = true
494
d6d298c93437 I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents: 492
diff changeset
59
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
60 [ui]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
61 color = true
548
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