-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathexecutable_dot_gitconfig
More file actions
62 lines (55 loc) · 1.74 KB
/
Copy pathexecutable_dot_gitconfig
File metadata and controls
62 lines (55 loc) · 1.74 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
[user]
name = Tatsuya Kamohara
email = tatsuya_kamohara@kyudentd.co.jp
[ghq]
root = ~/repo/src
[alias]
st = status
cp = cherry-pick
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 | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lga = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
have = branch --contains
[interactive]
diffFilter = delta --color-only
[color]
ui = auto
[push]
autoSetupRemote = true
[i18n]
commitEncoding = utf-8
logOutputEncoding = utf-8
[core]
quotepath = false
pager = delta
excludesFile = /Users/kamohara/.gitignore_global
[gui]
encoding = utf-8
[diff]
tool = meld
[mergetool "meld"]
path = /opt/homebrew/bin/meld
[difftool]
prompt = false
[mergetool]
prompt = false
keepBackup = false
[include]
path = ~/.config/delta/themes/catppuccin.gitconfig
[delta]
features = catppuccin-mocha
navigate = true
side-by-side = true
line-numbers = true
[merge]
tool = nvimdiff
conflictstyle = diff3
[mergetool "nvimdiff"]
layout = LOCAL,MERGED,REMOTE
[credential "https://github.com"]
helper =
helper = !/Users/kamohara/.local/share/mise/installs/gh/2.86.0/gh_2.86.0_macOS_arm64/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/Users/kamohara/.local/share/mise/installs/gh/2.86.0/gh_2.86.0_macOS_arm64/bin/gh auth git-credential