-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
44 lines (44 loc) · 1.3 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
[alias]
st = status
ll = ! git log --oneline -10 | cat
last = log -p -1
lmfs = ! git log --name-only -1| cat
lmfso = ! git log --name-only --pretty=format: -1 | cat
co = checkout
lfs = log --name-status
loo = log --oneline
rb = rebase
br = branch
cm = commit
df = diff
d = diff
difff = diff -- . ':!*.snap' ':!*-lock.json'
lastf = log -p -1 ':!*.snap'
vm = ! vim $(git ls-files -m)
inject = "!f() { set -e; HASH=`git show $1 --pretty=format:\"%H\" -q`; shift; git commit -m \"fixup! $HASH\" $*; [ -n \"$(git diff-files)\" ] && git stash && DIRTY=1; git rebase $HASH^^ -i --autosquash; [ -n \"$DIRTY\" ] && git stash pop;}; f"
logp = log -p
[user]
name = Taylor Flagg
email = trflagg@gmail.com
[core]
excludesfile = ~/.gitignore
editor = nvim
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path = opendiff
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
#driver for merging Xcode project files
[mergetool "mergepbx"]
cmd = mergepbx "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
[push]
default = simple
[credential]
helper = osxkeychain
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[diff]
tool = opendiff