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

Merge branch 'master' of ssh://git.penguincoder.org:2222/penguincoder/dotfiles

master
Andrew Coleman 2020-07-15 12:56:19 -04:00
parent 7cda7a2731 f1d40084b6
commit 5974dc7f66
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitconfig
View File

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

2
.vimrc
View File

@ -16,6 +16,8 @@ set expandtab
set listchars=tab:>-,trail:- set listchars=tab:>-,trail:-
set list set list
set noshowmode set noshowmode
set hlsearch
set incsearch
syntax on syntax on
filetype on filetype on