penguincoder
/
bare-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update git config for pull rebasing

master
Andrew Coleman 2020-07-15 12:42:13 -04:00
parent 74d43b7c62
commit 95ed192c92
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitconfig
View File

@ -15,6 +15,9 @@
conflictstyle = diff3 conflictstyle = diff3
prompt = false prompt = false
[pull]
rebase = false
[color] [color]
branch = auto branch = auto
diff = auto diff = auto