-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
54 lines (54 loc) · 1.73 KB
/
.gitconfig
File metadata and controls
54 lines (54 loc) · 1.73 KB
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
[core]
excludesfile = ~/.gitignore
#pager = git-split-diffs --color | less -RFX
[color]
ui = true
#[split-diffs]
# theme-name=github-light
[difftool]
prompt = false
[alias]
st = status -s -b
lg = log --graph --pretty=tformat:'%<(10)%C(red)%h %<(14,trunc)%C(blue)%an %C(reset)%s %C(cyan)%cd%C(reset) %C(green)%d' --date=format:'%d-%b/%a %H:%M'
gg = grep -En --break --heading
ap = add -p
ca = commit --amend
c = checkout
remote-prune = remote prune origin
br = branch --sort=-committerdate --format='%(if)%(upstream:track)%(then)%(if:equals=[gone])%(upstream:track)%(then)%(color:red)%(else)%(color:yellow)%(end)%(end)%(align:left,50)%(refname:lstrip=2) %(HEAD)%(end) %(align:left,30)%(if)%(upstream)%(then)%(upstream:remotename)%(upstream:track)%(else)<no upstream>%(end)%(end)%(committerdate)'
br-remote = branch -r --sort=committerdate --format='%(align:width=22)%(authorname)%(end) %(align:width=18)%(committerdate:relative)%(end) %(refname:lstrip=2)'
stash-all = stash save --include-untracked
[merge]
tool = smerge
conflictstyle=diff3
[mergetool "meld2way"]
cmd = meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
[mergetool "meld3way"]
cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE
[mergetool "smerge"]
cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
[push]
default = current
followTags = true
[branch]
autosetuprebase = always
[pull]
rebase = true
[remote "origin"]
prune = true
[fetch]
prune = true
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow bold
whitespace = red reverse
[init]
defaultBranch = main
[user]
name = max.rodionov
[includeIf "gitdir:~/w/nooga/"]
path = ~/.gitconfig.nooga
[includeIf "gitdir:~/w/me/"]
path = ~/.gitconfig.me