-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
48 lines (47 loc) · 1.37 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
[user]
name = Richard Hitier
email = [email protected]
[alias]
s = status -suno
br = branch
pull = pull --ff
d = difftool
co = checkout
ci = commit
# log with date relative
l = log --graph --pretty=\"format:%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset\"
# log with date and time
#lt = log --graph --pretty=\"format:%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ai%Creset\"
# other formats: '%ad' '%aD' '%at' '%aI' '%as'
lt = log --graph --pretty=\"format:%C(yellow)%h%Cblue%d%Creset %>(50)%s %C(white) %an, %ai%Creset\"
ltt = log --pretty=\"format:%C(yellow)%h%Creset %C(white) %an, %aD%Creset\"
lg = log --all --date=format-local:'%a %Y-%m-%d %H:%M:%S' --pretty=format:'%C(cyan)%h%Creset %C(white bold)%ad%Creset%C(auto) %s'
sl = stash list
sp = stash pop
[core]
editor = vim
pager = less -X
excludesfile = ~/.gitignore
[credential]
helper = cache --timeout 30000
[color]
ui = always
[push]
default = matching
[difftool]
prompt = false
[pull]
rebase = true
[diff]
tool = pycharm
[difftool "pycharm"]
cmd = /home/richard/Downloads/pycharm-2019.3.3/bin/pycharm.sh diff "$LOCAL" "$REMOTE" && echo "Press enter to continue..." && read
[merge]
tool = pycharm
keepBackup = false
[mergetool "pycharm"]
cmd = charm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
[fetch]
prune = true
[init]
defaultBranch = main