-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
46 lines (44 loc) · 1.31 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
[color]
status = always
[alias]
aa = add .
ap = add --patch
st = status -sb
cm = commit
co = checkout
cp = cherry-pick
df = diff --color
dc = diff --color --cached
ph = push
lg = log --pretty=oneline --abbrev-commit
pl = pull
sw = show --color
this = !git init && git add . && git commit -m \"initial commit\"
rhh = reset HEAD --hard
main-reset = !git fetch main && git reset main/$GIT_BRANCH --hard
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
clean-branches = !git fetch main; git branch --merged main/PRODUCTION | grep -v 'master$' | xargs git branch -d
[branch]
sort = -committerdate
[pull]
rebase = false
[user]
name = Andrei Lisnic
email = [email protected]
[push]
default = current
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = vimdiff
[core]
excludesfile = /Users/andrei/.gitignore_global
pager = less --mouse
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Users/andrei/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true