.gitconfig

Fri, 20 Sep 2019 00:43:39 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Fri, 20 Sep 2019 00:43:39 -0500
changeset 790
5ecabaf00ed2
parent 789
2d470b528b53
child 791
5b1ae7f6ee1e
permissions
-rw-r--r--

set rebase.autosquash

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
166
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
29 [branch]
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
30 autosetuprebase = always
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
31 autosetupmerge = always
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
32
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
33 [commit]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
34 verbose = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
35 gpgsign = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
36
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
37 [core]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
38 pager = LESS='FSRXi' less
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
39
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
40 [diff]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
41 compactionheuristic = true
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
42
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
43 [gpg]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
44 program = "gpg2"
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
45
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
46 [merge]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
47 tool = vimdiff2
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
48
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
49 [pretty]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
50 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
51
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
52 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
53 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
54
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
55 [rebase]
790
5ecabaf00ed2 set rebase.autosquash
Meredith Howard <mhoward@roomag.org>
parents: 789
diff changeset
56 autosquash = true
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
57 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
58
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
59 [transfer]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
60 fsckobjects = true
494
d6d298c93437 I like verbose commits
Meredith Howard <mhoward@roomag.org>
parents: 492
diff changeset
61
629
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
62 [ui]
c11c253374ac reorder sections
Meredith Howard <mhoward@roomag.org>
parents: 612
diff changeset
63 color = true
548
e34f183fbd55 Make sure git sticks to gpg2
Meredith Howard <mhoward@roomag.org>
parents: 542
diff changeset
64
186
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
65 # 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
66 [include]
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
67 path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
68
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
69 # vim: noet:sw=8

mercurial