Wed, 25 Mar 2015 23:18:57 -0700
add include .gitconfig.local
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] |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
12 | ci = commit |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
13 | record = !sh -c '(git add -p -- $@ && git commit -v ) || git reset' -- |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
14 | update = !git fetch --all --tags --prune && git pull --rebase |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
15 | incoming = "!git remote update -p; git log ..@{u}" |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
16 | outgoing = log @{u}.. |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
17 | glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative |
f8612a811de0
Merge .gitconfig from mhoward-lt(92aa984868e2)
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
18 | |
166
7d0c758c7a4d
default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents:
93
diff
changeset
|
19 | [branch] |
7d0c758c7a4d
default to rebase w/ pull
Meredith Howard <mhoward@roomag.org>
parents:
93
diff
changeset
|
20 | autosetuprebase = always |
173
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
21 | |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
22 | [include] |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
23 | path = ~/.gitconfig.local |
757eaebee0a2
add include .gitconfig.local
Meredith Howard <mhoward@roomag.org>
parents:
166
diff
changeset
|
24 |