-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
49 lines (49 loc) · 1.61 KB
/
.gitconfig
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
[user]
name = Elias Bagley
email = [email protected]
[push]
default = simple
[credential]
helper = osxkeychain
[color]
ui = true
[init]
templatedir = ~/.git_template
[alias]
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate # pretty log
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat # long log
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative # pretty log with date
tl = git log --no-walk --tags --pretty="%h %d %s" --decorate=full
fl = log -u # filelog, shows diff for each commit for file
la = "!git config -l | grep alias | cut -c 7-" # list aliases
# basic shortcuts
cp = cherry-pick
st = status
cl = clone
ci = commit
co = checkout
br = branch
# reset shortcuts
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
# removes all files which now match the git ignore
apply-gitignore = !git ls-files -ci --exclude-standard -z | xargs -0r git rm --cached
[core]
excludefiles = /Users/eliasbagley/.gitignore
excludefile = /Users/eliasbagley/.gitignore
excludesfile = /Users/eliasbagley/.gitignore
editor = /usr/bin/vim
[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
[http]
sslVerify = false
[url "[email protected]:"]
insteadOf = https://github.com