Repository navigation
Expand file tree
/
Copy pathdot_gitconfig
More file actions
83 lines (82 loc) · 2.67 KB
/
Copy pathdot_gitconfig
File metadata and controls
83 lines (82 loc) · 2.67 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
74
75
76
77
78
79
80
81
82
83
# vim: set ft=gitconfig noet ci pi sts=0 sw=4 ts=4 :
[user]
useconfigonly = true
[init]
templatedir = ~/.git_templates
[core]
excludesfile = ~/.gitignore
pager = diff-highlight | less -i
quotepath = false
precomposeunicode = true
editor = vim
[pager]
log = diff-highlight | less -i
show = diff-highlight | less -i
diff = diff-highlight | less -i
[color]
ui = auto
[color "decorate"]
head = cyan reverse
remoteBranch = green
branch = magenta
tag = magenta reverse
[commit]
verbose = true
[alias]
br = branch
ci = commit
st = status
co = checkout
b = browse
cp = cherry-pick
tree = log --graph --all --pretty='format:%>|(5)%x09%C(cyan)%<|(32)%an %Creset%C(yellow)%h%Creset %C(auto)%d%Creset %s'
tre = !git tree
tr = !git tree
d = diff
dc = diff --cached
di = diff
dic = diff --cached
dp = diff HEAD@{1}..HEAD
do = !git diff HEAD..origin/`git rev-parse --abbrev-ref HEAD`
mo = !git merge --ff-only origin/`git rev-parse --abbrev-ref HEAD`
setc = !git config user.name chieping && git config user.email takashi.honda.01@gmail.com && echo "user.name: `git config user.name`" && echo "user.email: `git config user.email`"
setp = !git config user.name 'Takashi Honda' && git config user.email honda@peoplex.jp && echo "user.name: `git config user.name`" && echo "user.email: `git config user.email`"
oops = commit --amend --reset-author
squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
fixup = !sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -
delete-merged-branches = !git branch --merged | egrep -v '^\\*|^\\+|main|master|develop' | xargs git branch -d
up = !git remote update -p && git merge --ff-only @{u}
# find-merge-commit prints merge commit hash from a specific commit or branch
find-merge-commit = !bash -c 'git rev-list $1..${2:-master} --ancestry-path | grep -f <(git rev-list $1..${2:-master} --first-parent) | tail -1' -
show-merge-commit = !bash -c 'git find-merge-commit "$1" "$2" | xargs git show' -
dt = !sh -c 'git diff-tree -r --name-only ${1-HEAD}' -
rhu = reset --hard @{upstream}
pushf = push --force-with-lease --force-if-includes
fmo = !git remote update -p && git merge origin/main --autostash
fro = !git remote update -p && git rebase origin/main --autostash
[interactive]
diffFilter = diff-highlight
[push]
default = simple
autoSetupRemote = true
[hub]
protocol = https
[ghq]
root = ~/src
[color "diff"]
meta = black cyan
[rebase]
autoStash = true
[svn]
rmdir = true
[rerere]
enabled = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[lfs "customtransfer.xet"]
path = git-xet
args = transfer
concurrent = true