-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitconfig
64 lines (64 loc) · 2.02 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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
# vim: filetype=gitconfig
[include]
path = .gitconfig.inc
[core]
autocrlf = input
ignorecase = false
[init]
defaultBranch = main
templatedir = ~/.git-templates
[branch]
autosetuprebase = local
[rebase]
autostash = true
[pull]
ff = only
[push]
default = simple
followTags = true
[diff]
renamelimit = 999999
colorMoved = default
[merge]
conflictstyle = diff3
renamelimit = 999999
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = auto
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[diff "lfs"]
textconv = cat
[alias]
cp = cherry-pick
st = status -sb
ci = commit
co = checkout
br = branch
f = fetch --verbose --prune
hub = "!hub"
lab = "!glab"
lol = log --pretty=oneline --abbrev-commit --graph --decorate
plog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
pullall = "!f(){ git pull \"$@\" && git submodule update --init --recursive && git submodule foreach 'git checkout master; git rebase origin/master'; }; f"
sync = "!f(){ git submodule foreach -q --recursive 'branch=\"$(git config -f $toplevel/.gitmodules submodule.$name.branch)\"; [ \"$branch\" = \"\" ] || git checkout $branch'; }; f"
pushf = push --force-with-lease
conflicts = diff --name-only --diff-filter=U
gh-pr = "!f(){ git fetch origin pull/$1/head:pr/$1; git checkout pr/$1; }; f"
[mergetool "diffmerge"]
cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
trustExitCode = true
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[difftool "diffmerge"]
cmd = /usr/local/bin/diffmerge "$LOCAL" "$REMOTE"
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =