.gitconfig

Fri, 22 Jan 2016 17:44:49 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Fri, 22 Jan 2016 17:44:49 -0500
changeset 244
721455edd12b
parent 229
0aefc3566070
child 251
308d12c05585
permissions
-rw-r--r--

Add some zsh options

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 [ui]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
6 color = true
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
7
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
8 [core]
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
9 pager = LESS='FSRX' less
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 [alias]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
12 ci = commit
207
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
13 rec = commit -p
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
14 unrec = checkout --patch
207
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
15 st = status -sb
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
16 co = checkout
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
17 br = branch
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
18 staged = diff --cached
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
19 unstage = reset HEAD --
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
20 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
21 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
22 out = "!git log --pretty=onelinecustom @{u}.."
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
23 new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}"
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
24 cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d"
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
25 ctags = "!~/.git_helpers/ctags"
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
26 glog = log --graph --pretty=onelinecustom
207
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
27 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
28
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
29 [pretty]
229
0aefc3566070 terminate format with a newline
Meredith Howard <mhoward@roomag.org>
parents: 228
diff changeset
30 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
31
166
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
32 [branch]
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
33 autosetuprebase = always
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
34 autosetupmerge = always
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
35
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
36 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
37 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
38
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
39 [rebase]
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
40 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
41
186
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
42 # 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
43 [include]
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
44 path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
45
182
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
diff changeset
46 # https://github.com/aanand/git-up
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
diff changeset
47 # $ gem install git-up
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
diff changeset
48 [git-up "rebase"]
228
bf3429214b78 Nice up log output in a few places
Meredith Howard <mhoward@roomag.org>
parents: 212
diff changeset
49 log-hook = "echo \"changes on $1 -> $2:\"; git --no-pager log --pretty=onelinecustom $1..$2"
182
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
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