-
Notifications
You must be signed in to change notification settings - Fork 5
Expand file tree
/
Copy pathgitconfig
More file actions
63 lines (63 loc) · 1.77 KB
/
gitconfig
File metadata and controls
63 lines (63 loc) · 1.77 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
55
56
57
58
59
60
61
62
63
[user]
email = zolboo.deb@gmail.com
name = Zolboo
[push]
default = simple
[core]
pager = diff-so-fancy | less --tabs=4 -RFX
autolf = true
[merge]
tool = nvim
[mergetool]
prompt = true
[difftool]
prompt = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $REMOTE
[color]
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[alias]
a = add
co = checkout
c = commit
d = diff
f = fetch --all
s = status
br = branch
edit = commit --amend
cnv = commit --no-verify
ov = commit --no-verify --amend --no-edit
l = log --decorate --graph
log = status
ll = log --decorate --graph origin/master..
ls = log --decorate --graph --oneline origin/master..
llf = log --decorate --graph
lsf = log --decorate --graph --oneline
dc = diff --cached
db = !git diff `git merge-base --fork-point origin/master`
rbb = !git rebase -i `git merge-base HEAD origin/master`
last = log -p -1
next = rebase --continue
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'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
fixup = "!sh -c 'rev=$(git rev-parse ${0}) && git commit --no-verify --fixup ${rev} && git rebase -i --autostash --autosquash ${rev}^ && echo --------git status---------- && git status'"
[cola]
spellcheck = false
[pull]
rebase = true
[init]
templateDir = /home/zerdenebayar/.git-template
[credential]
helper = cache --timeout=720000