Skip to content

Commit 5aa616d

Browse files
authored
chore(git): update git configuration (#218)
1 parent 25adc19 commit 5aa616d

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

config/git/.config/config

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,17 @@
4141

4242
[ghq]
4343
root = ~/projects
44+
45+
[tag]
46+
gpgSign = true
47+
48+
49+
insteadOf = https://github.com/
50+
51+
[difftool "sourcetree"]
52+
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
53+
path =
54+
55+
[mergetool "sourcetree"]
56+
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
57+
trustExitCode = true

config/git/.config/ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,4 @@ $RECYCLE.BIN/
194194

195195
# End of https://www.toptal.com/developers/gitignore/api/macOS,Windows,VisualStudioCode,Intellij
196196

197+
.env

0 commit comments

Comments
 (0)