Wed, 09 Sep 2015 14:54:04 -0400
Fix signify -- old settings were removed
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 |
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
13 | rec = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
14 | unrec = checkout --patch |
197
85a414f67356
Add git sb for short branch status
Meredith Howard <mhoward@roomag.org>
parents:
196
diff
changeset
|
15 | sb = status -sb |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
16 | update = "!git remote update -p && git merge --ff-only --stat @{u}" |
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
17 | in = "!git remote update -p; git log ..@{u}" |
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
18 | out = log @{u}.. |
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
19 | 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
|
20 | ctags = "!~/.git_helpers/ctags" |
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
21 | glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
22 | recent = for-each-ref --count=20 --sort=-committerdate --format='%(committerdate:short) %(refname:short)' |
93
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
23 | |
166
7d0c758c7a4d
default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents:
93
diff
changeset
|
24 | [branch] |
7d0c758c7a4d
default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents:
93
diff
changeset
|
25 | autosetuprebase = always |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
26 | autosetupmerge = always |
177 | 27 | |
28 | [push] | |
196
29fce4f498e5
Update gitconfig alases
Meredith Howard <mhoward@roomag.org>
parents:
190
diff
changeset
|
29 | default = current |
177 | 30 | |
31 | [rebase] | |
32 | stat = true | |
173
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
33 | |
186 | 34 | # 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
|
35 | [include] |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
36 | path = ~/.gitconfig.local |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
37 | |
182 | 38 | # https://github.com/aanand/git-up |
39 | # $ gem install git-up | |
40 | [git-up "rebase"] | |
190
38ea48f9eae9
skip the pager in git-up
Meredith Howard <mhoward@roomag.org>
parents:
186
diff
changeset
|
41 | log-hook = "echo \"changes on $1 -> $2:\"; git --no-pager log --oneline --decorate $1..$2" |
182 | 42 |