matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-26 05:29:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Set git pull to merge, not rebase.

Browse Source
This commit is contained in:
David Tomaschik
2020-03-31 09:58:45 -07:00
parent 8225785dcc
commit 08142409f8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/gitconfig
View File

@@ -67,3 +67,5 @@
prompt = false prompt = false
[include] [include]
path = ~/.gitconfig.local path = ~/.gitconfig.local
[pull]
rebase = false