.gitconfig

Wed, 21 Oct 2015 18:27:32 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Wed, 21 Oct 2015 18:27:32 -0400
changeset 213
859dd4b440d8
parent 212
36642e1d867a
child 228
bf3429214b78
permissions
-rw-r--r--

Add ndenv

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}"
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
21 in = "!git remote update -p; git log ..@{u}"
212
36642e1d867a Shorter outgoing log with glog
Meredith Howard <mhoward@roomag.org>
parents: 207
diff changeset
22 out = "!git glog @{u}.."
207
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
23 new = !sh -c 'git log $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"
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
26 glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
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)\"' "$@"
af14b7f5bc42 Add some new aliases
Meredith Howard <mhoward@roomag.org>
parents: 197
diff changeset
28 last = !sh -c 'git log -${1:-1} --stat' "$@"
93
f8612a811de0 Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff changeset
29
166
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
30 [branch]
7d0c758c7a4d default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents: 93
diff changeset
31 autosetuprebase = always
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
32 autosetupmerge = always
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
33
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
34 [push]
196
29fce4f498e5 Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents: 190
diff changeset
35 default = current
177
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
36
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
37 [rebase]
6d15a355e17a .gitconfig additions
Meredith Howard <mhoward@roomag.org>
parents: 173
diff changeset
38 stat = true
173
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
39
186
4d168818b573 verbose git-up
Meredith Howard <mhoward@roomag.org>
parents: 182
diff changeset
40 # 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
41 [include]
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
42 path = ~/.gitconfig.local
757eaebee0a2 add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents: 166
diff changeset
43
182
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
diff changeset
44 # https://github.com/aanand/git-up
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
diff changeset
45 # $ gem install git-up
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
diff changeset
46 [git-up "rebase"]
190
38ea48f9eae9 skip the pager in git-up
Meredith Howard <mhoward@roomag.org>
parents: 186
diff changeset
47 log-hook = "echo \"changes on $1 -> $2:\"; git --no-pager log --oneline --decorate $1..$2"
182
5a18e80bf2ea add git-up config
Meredith Howard <mhoward@roomag.org>
parents: 180
diff changeset
48

mercurial