forked from nicholasjhenry/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig.local
57 lines (57 loc) · 1.83 KB
/
gitconfig.local
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
[alias]
co = checkout
l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
pom = push origin master
phm = push heroku master
revert-last-commit = reset --soft HEAD^
unstage = reset HEAD
sm = smart-merge
sp = smart-pull
sl = smart-log
s = status
rbm = rebase master
ctags = !.git/hooks/ctags
sweep = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"
force-sweep = git branch | grep -v "master" | xargs git branch -D
# https://developer.atlassian.com/blog/2015/05/the-power-of-git-subtree/
sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f"
track = "!git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`"
[apply]
whitespace = nowarn
[color]
ui = auto
[branch "master"]
remote = origin
merge = refs/heads/master
# Rebase the branch master on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run
rebase = true
[core]
quotepath = false
excludesfile = ~/.gitignore
[push]
# Push current branch even if you've never pushed it before
default = current
[init]
templatedir = ~/.git_template
[commit]
gpgsign = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[include]
# dotfiles.secret/gitconfig
# [user]
# name = Nicholas Henry
# email = [email protected]
# signingkey = GPG signing key
# signingkey = GPG signing key
path = ~/Development/dotfiles.secret/gitconfig
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true