this repo has no description
Cleanup Git configuration
+21
-12
+12
-11
git/.config/git/config
+12
-11
git/.config/git/config
···
1
1
[core]
2
2
commitGraph = true
3
-
pager = "diff-so-fancy | less --tabs=4 -RFX"
3
+
4
+
[pager]
5
+
difftool = true
6
+
diff = "diff-so-fancy | less --tabs=4 -RFX"
4
7
5
8
[init]
6
9
defaultBranch = master
···
21
24
cob = checkout -b
22
25
lg = log --color --graph --abbrev-commit --pretty=simple-oneline
23
26
rci = commit --amend --reuse-message HEAD
24
-
squash = rebase -i @{u}
27
+
squash = rebase --interactive --autosquash @{upstream}
25
28
st = status -sb
26
29
todo = grep -Ee '\\bTODO:?\\b'
27
30
fixme = grep -Ee '\\bFIX(ME)?:?\\b'
28
-
com = checkout master
31
+
com = "!git checkout $(git default-branch)"
29
32
skip = update-index --skip-worktree
30
33
unskip = update-index --no-skip-worktree
31
-
publish = push -u hauleth
32
-
cleanup = "!git branch --format=\"%(if:notequals=*)%(HEAD)%(then)%(if:notequals=${1:-master})%(refname:lstrip=2)%(then)%(refname:lstrip=2)%(end)%(end)\" --merged master | xargs -rpxL1 git branch -d"
34
+
default-branch = "!git symbolic-ref --short refs/remotes/origin/HEAD | sed 's|^origin/||'"
35
+
cleanup = "!git branch --format=\"%(if:notequals=*)%(HEAD)%(then)%(if:notequals=${1:-$(git default-branch)})%(refname:lstrip=2)%(then)%(refname:lstrip=2)%(end)%(end)\" --merged $(git default-branch) | xargs -rpxL1 git branch -d"
33
36
34
37
[pretty]
35
-
simple-oneline = "%C(yellow)%h%C(auto)%d %s <%C(green)%aN%C(reset)> (%C(blue)%ar%C(reset))"
38
+
simple-oneline = "%C(yellow)%h%C(auto)%d %s [%C(green)%aN <%aE>%C(reset)] (%C(blue)%ar%C(reset))"
36
39
37
40
[merge]
38
41
conflictstyle = diff3
···
51
54
[rebase]
52
55
autostash = true
53
56
autosquash = true
54
-
[credential]
55
-
helper = cache --timeout=3600
56
57
[fetch]
57
58
prune = true
58
59
[help]
···
67
68
suffix = "-rc"
68
69
suffix = "-pre"
69
70
[commit]
70
-
gpgsign = true
71
+
gpgSign = true
71
72
verbose = true
72
73
cleanup = scissors
73
74
···
78
79
required = true
79
80
80
81
[rerere]
81
-
enabled = true
82
+
enabled = false
82
83
83
84
[diff]
84
85
indentHeuristic = true
···
90
91
xfuncname = "^(#+\\s+.*)$"
91
92
92
93
[difftool]
93
-
prompt = true
94
+
prompt = false
94
95
95
96
[difftool "difftastic"]
96
97
cmd = difft "$LOCAL" "$REMOTE"
+9
-1
git/.config/git/ignore
+9
-1
git/.config/git/ignore
···
36
36
# }}}
37
37
# Configs {{{
38
38
.envrc
39
+
.direnv
39
40
# }}}
40
41
# Editors {{{
41
42
# VIM
···
67
68
oprofile_data
68
69
.tool-versions-e
69
70
# }}}
71
+
72
+
# Tooling {{{
70
73
.elixir_ls
71
-
/.direnv
72
74
.vagrant/
75
+
# }}}
76
+
77
+
# Stack {{{
78
+
.stack-work
79
+
# }}}
80
+
73
81
erl_crash.dump