-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
59 lines (59 loc) · 1.8 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
[include]
path = ~/.gitconfig.user
[core]
pager = less -+F -iRX
excludesfile = ~/.gitignore
[push]
default = upstream
[log]
follow = true
[diff]
tool = customvim
[difftool "customvim"]
cmd = exec_vim.sh -g -R -f -c 'set columns=260' -c 'wincmd =' -d \"$LOCAL\" \"$REMOTE\"
[merge]
tool = customvim
conflictstyle = diff3
defaultToUpstream = false
[mergetool "customvim"]
cmd = exec_vim.sh -g -f -c 'set columns=260' -c 'wincmd =' -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
trustExitCode = true
[alias]
s = status -sb
s1 = status -sb -uno
desc = describe --tags
sh = show --shortstat --abbrev-commit --decorate
sh1 = show --shortstat --abbrev-commit --oneline --no-decorate
diffro = diff --right-only
ds = diff --stat
dsn = diff --stat --name-only
dsro = diff --stat --right-only
graph = log --graph --decorate --oneline
merges = log --merges --decorate --oneline
md = log --merges --date=short --pretty=format:'%C(yellow)%h %C(cyan)%cd %C(magenta)%aN %Creset%s'
mdp = log --merges --date=short --pretty=format:'%h %cd %s'
mdc = log --merges --date=short --pretty=format:'%h %cd %cN %s'
lo = log --oneline
loro = log --oneline --right-only
ld = log --date=short --pretty=format:'%C(yellow)%h %C(cyan)%cd %C(magenta)%aN%C(red bold)%d %Creset%s'
logrop = log --right-only --reverse -p
std = stash list --pretty=format:'%C(yellow)%h %C(cyan)%ai %C(red bold)%gd%n %Creset%s'
mb = merge-base --fork-point master
fp = fetch --prune
puff = pull --ff-only
ffp = merge --ff-only @{push}
ff = merge --ff-only
non-ff = merge --no-ff --no-edit
cmend = commit --amend --no-edit
[color]
ui = auto
[color "status"]
changed = red bold
nobranch = red bold
untracked = red bold
[color "branch"]
remote = red bold
[color "diff"]
old = red bold
[init]
defaultBranch = main