-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
73 lines (70 loc) · 2.57 KB
/
.gitconfig
File metadata and controls
73 lines (70 loc) · 2.57 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
64
65
66
67
68
69
70
71
72
73
[include]
path = .gitconfig.local
# ~/.gitconfig.local
##[user]
## name
## email
[color]
ui = true
diff = auto
status = auto
branch = auto
[alias]
# http://oli.jp/2012/git-powerup/
# http://blog.blindgaenger.net/advanced_git_aliases.html
alias = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\\t => \\2/' | sort
b = branch -a
br = browse-remote
ch = checkout
ci = commit
co = checkout
d = diff
dc = diff --cached
dn = diff --name-only
di = diff
dic = diff --cached
f = fetch --prune
fs = !git f && git su
hint = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
info = remote show origin
l = log --graph -n 20 --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(green)- %an, %cr%Creset'
ll = log --stat --abbrev-commit
ln = !git log --date=short --pretty=format:'%C(yellow)%h %C(cyan)%cd %C(reset)%<('"$(echo $(($(tput cols) - 66)))"',trunc)%s %C(red)%>(32,trunc)%d %C(blue)%<(12,trunc)%an'
graph = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lp = log --oneline -n 20 -p
ls = ls-files
s = status --short --branch
st = status
su = submodule update
sw = switch
re = restore
[core]
excludesfile = ~/.gitignore
pager = less
editor = emacsclient -t -a=\\\"\\\"
[mergetool.ediff]
cmd = emacsclient --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
[merge]
tool = ediff
[ghq]
root = ~/ghq
[push]
default = simple
[credential]
helper = libsecret
[help]
autoCorrect = -1
[pull]
ff = only
[log]
abbrevCommit = true
decorate = short
[rerere]
enabled = true
autoUpdate = true
[diff]
algorithm = histogram
[rebase]
autosquash = true
[init]
defaultBranch = main