this repo has no description
Remove fish-generated comments from functions
Minor updates to brewfile, add alts for gitconfig, yadm hooks.
+116
-334
+1
-1
.Brewfile
+1
-1
.Brewfile
+9
.config/fish/conf.d/10-fisher.fish
+9
.config/fish/conf.d/10-fisher.fish
···
1
+
# Use a custom install dir for fisher, this does not need to be tracked
2
+
set -g fisher_path ~/.config/fish/fisher_install
3
+
4
+
set fish_function_path $fish_function_path[1] $fisher_path/functions $fish_function_path[2..-1]
5
+
set fish_complete_path $fish_complete_path[1] $fisher_path/completions $fish_complete_path[2..-1]
6
+
7
+
for file in $fisher_path/conf.d/*.fish
8
+
builtin source $file 2> /dev/null
9
+
end
+2
-2
.config/fish/conf.d/iterm2_shell_integration.fish
.config/fish/conf.d/00-iterm2_shell_integration.fish
+2
-2
.config/fish/conf.d/iterm2_shell_integration.fish
.config/fish/conf.d/00-iterm2_shell_integration.fish
···
2
2
# modify it under the terms of the GNU General Public License
3
3
# as published by the Free Software Foundation; either version 2
4
4
# of the License, or (at your option) any later version.
5
-
#
5
+
#
6
6
# This program is distributed in the hope that it will be useful,
7
7
# but WITHOUT ANY WARRANTY; without even the implied warranty of
8
8
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9
9
# GNU General Public License for more details.
10
-
#
10
+
#
11
11
# You should have received a copy of the GNU General Public License
12
12
# along with this program; if not, write to the Free Software
13
13
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-15
.config/fish/conf.d/nvm.fish
-15
.config/fish/conf.d/nvm.fish
···
1
-
function _nvm_uninstall -e nvm_uninstall
2
-
if test -s "$nvm_config/version"
3
-
read -l ver <$nvm_config/version
4
-
if set -l i (contains -i -- "$nvm_config/$ver/bin" $fish_user_paths)
5
-
set -e fish_user_paths[$i]
6
-
end
7
-
command rm -f $nvm_config/version
8
-
end
9
-
10
-
for name in (set -n | command awk '/^nvm_/')
11
-
set -e "$name"
12
-
end
13
-
14
-
functions -e (functions -a | command awk '/^_nvm_/')
15
-
end
+3
-2
.config/fish/config.fish
.config/fish/conf.d/50-config.fish
+3
-2
.config/fish/config.fish
.config/fish/conf.d/50-config.fish
···
2
2
set -U fish_user_paths ~/.cargo/bin
3
3
4
4
# Run nvm to update fish_user_paths for npm installs. Allow failure if running
5
-
# outside home directory (no .nvmrc found)
6
-
nvm || true
5
+
# outside home directory (no .nvmrc found), and run in background to avoid
6
+
# blocking the shell from starting
7
+
# nvm &>/dev/null & || true
7
8
8
9
if not set -q DOCKER_NAME; and test -f /etc/profile.d/docker_name.sh
9
10
set -gx DOCKER_NAME (sed -E 's/.*DOCKER_NAME=(.+)/\1/' /etc/profile.d/docker_name.sh)
-1
.config/fish/functions/bash_env.fish
-1
.config/fish/functions/bash_env.fish
-1
.config/fish/functions/beep.fish
-1
.config/fish/functions/beep.fish
-1
.config/fish/functions/dsh.fish
-1
.config/fish/functions/dsh.fish
+3
.config/fish/functions/egrep.fish
+3
.config/fish/functions/egrep.fish
+4
.config/fish/functions/emacs.fish
+4
.config/fish/functions/emacs.fish
-1
.config/fish/functions/f.fish
-1
.config/fish/functions/f.fish
+20
.config/fish/functions/fish_normalize_saved_functions.fish
+20
.config/fish/functions/fish_normalize_saved_functions.fish
···
1
+
function fish_normalize_saved_functions --description "Remove fish-generated paths in saved functions"
2
+
set -l exclude_functions \
3
+
"fish_normalize_saved_functions" \
4
+
"fish_prompt" \
5
+
"fisher"
6
+
7
+
for fish_function in ~/.config/fish/functions/*.fish
8
+
set -l func_name (basename $fish_function .fish)
9
+
set -l rel_func_path '~/.config/fish/functions/'$func_name'.fish'
10
+
11
+
if ! contains $func_name $exclude_functions
12
+
funcsave $func_name
13
+
end
14
+
15
+
if test $func_name != "fish_normalize_saved_functions"
16
+
sed -e '/ Defined in .*\.fish/d' $fish_function >$fish_function.new
17
+
mv $fish_function.new $fish_function
18
+
end
19
+
end
20
+
end
-1
.config/fish/functions/fish_prompt.fish
-1
.config/fish/functions/fish_prompt.fish
+2
-2
.config/fish/functions/fisher.fish
+2
-2
.config/fish/functions/fisher.fish
···
1
-
set -g fisher_version 3.2.10
1
+
set -g fisher_version 3.2.11
2
2
3
3
function fisher -a cmd -d "fish package manager"
4
4
set -q XDG_CACHE_HOME; or set XDG_CACHE_HOME ~/.cache
···
247
247
for (n = split(ARGSTR, a, " "); i++ < n;) pkgs[getkey(a[i])] = a[i]
248
248
}
249
249
!NF { next } { k = getkey($1) }
250
-
MODE == "-R" && !(k in pkgs) && $0 = $1
250
+
MODE == "-R" && !(k in pkgs) && ($0 = $1)
251
251
MODE == "-W" && (/^#/ || k in pkgs || CMD != "rm") { print pkgs[k] (sub($1, "") ? $0 : "") }
252
252
MODE == "-W" || CMD == "rm" { delete pkgs[k] }
253
253
END {
-1
.config/fish/functions/func_name.fish
-1
.config/fish/functions/func_name.fish
-1
.config/fish/functions/generate_bazel_completions.fish
-1
.config/fish/functions/generate_bazel_completions.fish
-1
.config/fish/functions/generate_i95_targets.fish
-1
.config/fish/functions/generate_i95_targets.fish
+3
.config/fish/functions/grep.fish
+3
.config/fish/functions/grep.fish
-1
.config/fish/functions/history.fish
-1
.config/fish/functions/history.fish
-1
.config/fish/functions/ls.fish
-1
.config/fish/functions/ls.fish
-1
.config/fish/functions/mux.fish
-1
.config/fish/functions/mux.fish
-232
.config/fish/functions/nvm.fish
-232
.config/fish/functions/nvm.fish
···
1
-
set -g nvm_version 1.0.2
2
-
3
-
function nvm -a cmd -d "Node.js version manager"
4
-
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
5
-
set -g nvm_config $XDG_CONFIG_HOME/nvm
6
-
set -g nvm_file .nvmrc
7
-
set -q nvm_mirror; or set -g nvm_mirror "https://nodejs.org/dist"
8
-
9
-
if test ! -d $nvm_config
10
-
command mkdir -p $nvm_config
11
-
end
12
-
13
-
switch "$cmd"
14
-
case ls list
15
-
set -e argv[1]
16
-
_nvm_ls $argv
17
-
case use
18
-
set -e argv[1]
19
-
_nvm_use $argv
20
-
case ""
21
-
if isatty
22
-
if set -l root (_nvm_find_up (pwd) $nvm_file)
23
-
read cmd <$root/$nvm_file
24
-
end
25
-
else
26
-
read cmd
27
-
end
28
-
if not set -q cmd[1]
29
-
echo "nvm: version or .nvmrc file missing" >&2
30
-
_nvm_help >&2
31
-
return 1
32
-
end
33
-
34
-
_nvm_use $cmd
35
-
case {,-}-v{ersion,}
36
-
echo "nvm version $nvm_version"
37
-
case {,-}-h{elp,}
38
-
_nvm_help
39
-
case complete
40
-
_nvm_complete "$nvm_config/index"
41
-
case \*
42
-
echo "nvm: unknown flag or command \"$cmd\"" >&2
43
-
_nvm_help >&2
44
-
return 1
45
-
end
46
-
end
47
-
48
-
function _nvm_help
49
-
echo "usage: nvm --help Show this help"
50
-
echo " nvm --version Show the current version of nvm"
51
-
echo " nvm ls [<regex>] List available versions matching <regex>"
52
-
echo " nvm use <version> Download <version> and modify PATH to use it"
53
-
echo " nvm Use version in .nvmrc (or stdin if not a tty)"
54
-
echo "examples:"
55
-
echo " nvm use 12"
56
-
echo " nvm use lts"
57
-
echo " nvm use latest"
58
-
echo " nvm use dubnium"
59
-
echo " nvm ls '^1|9\$'"
60
-
echo " nvm ls 10"
61
-
echo " nvm <file"
62
-
end
63
-
64
-
function _nvm_complete -a index
65
-
if test -s "$index"
66
-
for alias in (command awk '
67
-
$4 {
68
-
for (i = split($4, alias, "|"); i; i--)
69
-
if (!seen[alias[i]]++) print alias[i]
70
-
}
71
-
$2 != "-" && !seen[$2]++ { print $2 } { print $1 }
72
-
' <$index)
73
-
complete -xc nvm -n "__fish_seen_subcommand_from use" -a $alias
74
-
end
75
-
end
76
-
end
77
-
78
-
function _nvm_get_index
79
-
set -l index "$nvm_config/index"
80
-
set -q nvm_index_update_interval; or set -g nvm_index_update_interval 0
81
-
82
-
if test ! -e $index -o (math (command date +%s) - $nvm_index_update_interval) -gt 120
83
-
command curl -sS $nvm_mirror/index.tab | command awk -v OFS=\t '
84
-
NR > 1 && !/^v0\.[1-9]\./ {
85
-
split($1 = substr($1, 2), v, ".")
86
-
is_latest = NR == 2
87
-
alias = ($10 = tolower($10)) == "-" ? "" : "lts|"$10
88
-
is_lts = alias != ""
89
-
print $1, (/^0/ ? "-" : v[1]), v[1]"."v[2],
90
-
is_latest ? is_lts ? alias"|latest" : "latest" : is_lts ? alias : ""
91
-
}
92
-
' >$index 2>/dev/null
93
-
94
-
if test ! -s "$index"
95
-
echo "nvm: invalid mirror index -- is \"$nvm_mirror\" a valid host?" >&2
96
-
return 1
97
-
end
98
-
99
-
_nvm_complete $index
100
-
set -g nvm_index_update_interval (command date +%s)
101
-
end
102
-
103
-
echo $index
104
-
end
105
-
106
-
function _nvm_ls -a query
107
-
set -l index (_nvm_get_index); or return
108
-
test -s "$nvm_config/version"; and read -l current <"$nvm_config/version"
109
-
command awk -v current="$current" '
110
-
$1 ~ /'"$query"'/ {
111
-
gsub(/\|/, "/", $4)
112
-
out[n++] = $1
113
-
out[n++] = $4 ($1 == current ? ($4 ? "/" : "") "current" : "")
114
-
pad = pad < length($1) ? length($1) : pad
115
-
}
116
-
END {
117
-
for (i = n - 1; i > 0; i -= 2) {
118
-
printf("%"pad"s %s\n", out[i - 1] , out[i] ? "("out[i]")": "")
119
-
}
120
-
}
121
-
' <$index 2>/dev/null
122
-
end
123
-
124
-
function _nvm_resolve_version
125
-
set -l index (_nvm_get_index); or return
126
-
set -l ver (command awk -v ver="$argv[1]" '
127
-
BEGIN {
128
-
if (match(ver, /v[0-9]/)) gsub(/^[ \t]*v|[ \t]*$/, "", ver)
129
-
if ((n = split(tolower(ver), a, "/")) > 3) exit
130
-
for (ver = a[1]; n > 0; n--) {
131
-
if (a[n] != "*" && a[n] != "latest" && (ver = a[n]) != "lts")
132
-
break
133
-
}
134
-
}
135
-
ver == $1"" || ver == $2"" || ver == $3"" || $4 && ver ~ $4 {
136
-
print $1
137
-
exit
138
-
}
139
-
' <$index 2>/dev/null)
140
-
141
-
if not set -q ver[1]
142
-
return 1
143
-
end
144
-
145
-
echo $ver
146
-
end
147
-
148
-
function _nvm_use
149
-
set -l index (_nvm_get_index); or return
150
-
set -l ver (_nvm_resolve_version $argv[1])
151
-
152
-
if not set -q ver[1]
153
-
echo "nvm: invalid version number or alias: \"$argv[1]\"" >&2
154
-
return 1
155
-
end
156
-
157
-
if test ! -d "$nvm_config/$ver/bin"
158
-
set -l os
159
-
set -l arch
160
-
set -l name "node-v$ver"
161
-
set -l target "$nvm_config/$ver"
162
-
switch (uname -s)
163
-
case Linux
164
-
set os linux
165
-
switch (uname -m)
166
-
case x86_64
167
-
set arch x64
168
-
case armv6 armv6l
169
-
set arch armv6l
170
-
case armv7 armv7l
171
-
set arch armv7l
172
-
case armv8 armv8l aarch64
173
-
set arch arm64
174
-
case \*
175
-
set arch x86
176
-
end
177
-
set name "$name-linux-$arch.tar.gz"
178
-
case Darwin
179
-
set os darwin
180
-
set arch x64
181
-
case \*
182
-
echo "nvm: OS not implemented -- request it on https://git.io/fish-nvm" >&2
183
-
return 1
184
-
end
185
-
186
-
set -l name "node-v$ver-$os-$arch"
187
-
set -l url $nvm_mirror/v$ver/$name
188
-
189
-
echo "fetching $url" >&2
190
-
command mkdir -p $target/$name
191
-
192
-
if not command curl -L --fail --progress-bar $url.tar.gz | command tar -xzf- -C $target/$name
193
-
command rm -rf $target
194
-
echo "nvm: fetch error -- are you offline?" >&2
195
-
return 1
196
-
end
197
-
198
-
command mv -f $target/$name/$name $nvm_config/$ver.
199
-
command rm -rf $target
200
-
command mv -f $nvm_config/$ver. $target
201
-
end
202
-
203
-
if test -s "$nvm_config/version"
204
-
read -l last <"$nvm_config/version"
205
-
if set -l i (contains -i -- "$nvm_config/$last/bin" $fish_user_paths)
206
-
set -e fish_user_paths[$i]
207
-
end
208
-
end
209
-
210
-
if set -l root (_nvm_find_up (pwd) $nvm_file)
211
-
read -l line <$root/$nvm_file
212
-
if test $ver != (_nvm_resolve_version $line)
213
-
echo $argv[1] >$root/$nvm_file
214
-
end
215
-
end
216
-
217
-
echo $ver >$nvm_config/version
218
-
219
-
if not contains -- "$nvm_config/$ver/bin" $fish_user_paths
220
-
set -U fish_user_paths "$nvm_config/$ver/bin" $fish_user_paths
221
-
end
222
-
end
223
-
224
-
function _nvm_find_up -a path file
225
-
if test -e "$path/$file"
226
-
echo $path
227
-
else if test "$path" != /
228
-
_nvm_find_up (command dirname $path) $file
229
-
else
230
-
return 1
231
-
end
232
-
end
-1
.config/fish/functions/py.fish
-1
.config/fish/functions/py.fish
-1
.config/fish/functions/rcheck.fish
-1
.config/fish/functions/rcheck.fish
-1
.config/fish/functions/refresh_branches.fish
-1
.config/fish/functions/refresh_branches.fish
-1
.config/fish/functions/remote_cmd.fish
-1
.config/fish/functions/remote_cmd.fish
-1
.config/fish/functions/rmake.fish
-1
.config/fish/functions/rmake.fish
-1
.config/fish/functions/rpush.fish
-1
.config/fish/functions/rpush.fish
-1
.config/fish/functions/rrobot.fish
-1
.config/fish/functions/rrobot.fish
-1
.config/fish/functions/sortfile.fish
-1
.config/fish/functions/sortfile.fish
-1
.config/fish/functions/sudoedit.fish
-1
.config/fish/functions/sudoedit.fish
-1
.config/fish/functions/swap.fish
-1
.config/fish/functions/swap.fish
-4
.config/fish/functions/time.fish
-4
.config/fish/functions/time.fish
-1
.config/fish/functions/tmux_attach.fish
-1
.config/fish/functions/tmux_attach.fish
+2
-3
.config/fish/functions/vi.fish
+2
-3
.config/fish/functions/vi.fish
+1
-2
.config/fish/functions/vim.fish
+1
-2
.config/fish/functions/vim.fish
+10
-6
.config/fish/functions/vscode_ext.fish
+10
-6
.config/fish/functions/vscode_ext.fish
···
1
-
# Defined in /var/folders/4w/bjgmcfds1nv33zqkhf2q2_340000gp/T//fish.marwk0/vscode_ext.fish @ line 2
2
-
function vscode_ext
1
+
function vscode_ext --description 'Run VSCode with only specific extensions enabled'
3
2
4
3
function print_help
5
4
set -l cmd (status current-command)
6
5
echo $cmd": Run VSCode with only specific extensions enabled"
7
6
echo
8
-
echo "USAGE: $cmd [options] <extension-id> [extension-id ...]"
7
+
echo "USAGE: $cmd [options] <extension-id> [extension-id ...] [-- code-args ...]"
9
8
echo
10
9
echo "OPTIONS:"
11
10
echo " -d, --dry-run Print the command that would be run, instead"
···
15
14
echo
16
15
end
17
16
17
+
set -l passthrough_args
18
+
if set -l arg_index (contains --index -- '--' $argv)
19
+
set passthrough_args $argv[(math $arg_index + 1)..-1]
20
+
set -e argv[$arg_index..-1]
21
+
end
22
+
18
23
set -l options \
19
24
(fish_opt --short=h --long=help) \
20
25
(fish_opt --short=d --long=dry-run)
···
33
38
echo $funcname": Expected at least 1 args, got 0"
34
39
return 1
35
40
end
36
-
37
41
38
42
set -l extensions (code --list-extensions | grep -v $argv)
39
43
set -l code_args "--new-window" --disable-extension={$extensions}
40
44
41
45
if test "$_flag_dry_run" != ""
42
-
echo code $code_args
46
+
echo code $code_args $passthrough_args
43
47
else
44
-
code $code_args
48
+
code $code_args $passthrough_args
45
49
end
46
50
end
-1
.config/fish/functions/vssh.fish
-1
.config/fish/functions/vssh.fish
+4
.config/git/gitconfig.local##class.personal
+4
.config/git/gitconfig.local##class.personal
+4
.config/git/gitconfig.local##class.work
+4
.config/git/gitconfig.local##class.work
+5
-7
.config/vscode/extensions.txt
+5
-7
.config/vscode/extensions.txt
···
4
4
bungcip.better-toml@0.3.2
5
5
codezombiech.gitignore@0.6.0
6
6
DavidAnson.vscode-markdownlint@0.36.0
7
-
dcasella.monokai-plusplus@1.9.1
8
7
dnicolson.binary-plist@0.4.0
9
8
DotJoshJohnson.xml@2.5.0
10
9
dunstontc.viml@0.1.7
11
-
eamodio.gitlens@10.2.1
10
+
eamodio.gitlens@10.2.2
12
11
fabiospampinato.vscode-statusbar-debugger@2.0.6
13
12
golang.Go@0.14.4
14
13
IBM.output-colorizer@0.1.2
15
14
jeff-hykin.better-cpp-syntax@1.14.31
16
15
korekontrol.saltstack@0.0.8
17
16
kumar-harsh.graphql-for-vscode@1.15.3
18
-
LaurentTreguier.rpm-spec@0.2.3
17
+
LaurentTreguier.rpm-spec@0.3.0
19
18
mariusschulz.yarn-lock-syntax@0.1.3
20
19
marko2276.yang@0.1.3
21
-
matklad.rust-analyzer@0.2.199
20
+
matklad.rust-analyzer@0.2.207
22
21
ms-azuretools.vscode-docker@1.2.1
23
-
ms-python.python@2020.5.86398
22
+
ms-python.python@2020.5.86806
24
23
ms-vscode-remote.remote-ssh@0.51.0
25
24
ms-vscode-remote.remote-ssh-edit@0.51.0
26
25
ms-vscode.cmake-tools@1.4.0
27
26
ms-vscode.cpptools@0.28.3
28
27
ms-vscode.vscode-typescript-tslint-plugin@1.2.3
29
-
ms-vsliveshare.vsliveshare@1.0.2274
28
+
ms-vsliveshare.vsliveshare@1.0.2302
30
29
ms-vsliveshare.vsliveshare-pack@0.4.0
31
30
redhat.vscode-xml@0.11.0
32
31
redhat.vscode-yaml@0.8.0
···
39
38
TomiTurtiainen.rf-intellisense@2.8.0
40
39
twxs.cmake@0.0.17
41
40
Veracosta.mib@0.0.4
42
-
vsciot-vscode.vscode-arduino@0.3.1
43
41
vscode-org-mode.org-mode@1.0.0
44
42
wholroyd.jinja@0.0.8
45
43
xoronic.pestfile@0.0.2
+3
.config/yadm/bootstrap
+3
.config/yadm/bootstrap
+3
.config/yadm/hooks/pre_commit
+3
.config/yadm/hooks/pre_commit
+32
-34
.gitconfig
+32
-34
.gitconfig
···
1
-
[user]
2
-
# TODO: include alternates for work/personal
3
-
name = Ian Chamberlain
4
-
email = ichamberlain@128technology.com
5
-
login = ichamberlain
1
+
[include]
2
+
path = ~/.config/git/gitconfig.local
6
3
[alias]
7
-
co = checkout
8
-
br = branch
9
-
ci = commit
10
-
st = status
11
-
unstage = reset HEAD --
12
-
last = log -1 HEAD
13
-
delete = branch -d
14
-
ppull = pull -p
15
-
pfetch = fetch -p
16
-
hardreset = reset --hard @{u}
17
-
fpush = push --force-with-lease
18
-
ld = log --pretty=format:\"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]\" --decorate --date=relative
19
-
sw = switch
20
-
softreset = reset --soft HEAD~
21
-
default-branch = !git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'
22
-
branch-clean = !git branch --merged \"$(git default-branch)\" | egrep -v \"$(git default-branch)$\" | xargs -n 1 git branch --delete
23
-
alias = "!sh -c '[ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && exit 0 || echo \"usage: git alias <new alias> <original command>\" >&2 && exit 1' -"
24
-
aliases = !git config --get-regexp 'alias.*' | sed -E 's/alias\\.([^[:space:]]+)[[:space:]](.+)/[\\1]'$'\\\\\\n'' \\2/'
25
-
bc = branch-clean
4
+
co = checkout
5
+
br = branch
6
+
ci = commit
7
+
st = status
8
+
unstage = reset HEAD --
9
+
last = log -1 HEAD
10
+
delete = branch -d
11
+
ppull = pull -p
12
+
pfetch = fetch -p
13
+
hardreset = reset --hard @{u}
14
+
fpush = push --force-with-lease
15
+
ld = log --pretty=format:\"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]\" --decorate --date=relative
16
+
sw = switch
17
+
softreset = reset --soft HEAD~
18
+
default-branch = !git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'
19
+
branch-clean = !git branch --merged \"$(git default-branch)\" | egrep -v \"$(git default-branch)$\" | xargs -n 1 git branch --delete
20
+
alias = "!sh -c '[ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && exit 0 || echo \"usage: git alias <new alias> <original command>\" >&2 && exit 1' -"
21
+
aliases = !git config --get-regexp 'alias.*' | sed -E 's/alias\\.([^[:space:]]+)[[:space:]](.+)/[\\1]'$'\\\\\\n'' \\2/'
22
+
bc = branch-clean
26
23
[core]
27
-
excludesfile = /Users/ichamberlain/.gitignore_global
28
-
editor = /usr/bin/vim
24
+
excludesfile = ~/.gitignore_global
25
+
editor = /usr/local/bin/nvim
29
26
[difftool]
30
27
prompt = false
31
28
[difftool "vscode"]
32
-
cmd = /usr/local/bin/code --diff --wait $LOCAL $REMOTE
29
+
cmd = /usr/local/bin/code --diff --wait $LOCAL $REMOTE
33
30
[mergetool "vscode"]
34
-
cmd = /usr/local/bin/code --wait $MERGED
35
-
trustExitCode = true
31
+
cmd = /usr/local/bin/code --wait $MERGED
32
+
trustExitCode = true
36
33
[diff]
37
-
tool = vscode
34
+
tool = vscode
38
35
[merge]
39
-
renameLimit = 2000
36
+
renameLimit = 2000
40
37
[submodule]
41
-
recurse = true
38
+
recurse = true
42
39
[push]
43
-
recurseSubmodules = on-demand
40
+
# Override 'submodule.recurse' to make rpush work without warnings
41
+
recurseSubmodules = no
44
42
[pull]
45
-
rebase = false
43
+
rebase = false
+4
Library/Application Support/Code/User/settings.json
+4
Library/Application Support/Code/User/settings.json
···
114
114
"*.aliases": "shellscript",
115
115
"*.bazel": "starlark",
116
116
"*.bazelrc": "gitignore",
117
+
".gitconfig": "ini",
118
+
"gitconfig.*": "ini",
117
119
"*.h": "c",
118
120
"*.init": "json",
119
121
"*.inputactions": "json",
120
122
"*.j2": "jinja",
123
+
"*.log-*": "log",
124
+
"*.log.*": "log",
121
125
"*.my": "mib",
122
126
"*.org": "org",
123
127
"*.plist": "xml",