c0de/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change merge stratigy

Browse Source
This commit is contained in:
David Todd 2020-09-28 14:50:22 -05:00
parent 2ab0a902b5
commit 379d4b2c90
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
home/gitconfig
View File

@ -32,6 +32,7 @@
pull-with-submodules = !git pull && git submodule update --init pull-with-submodules = !git pull && git submodule update --init
rpull-with-submodules = !git pull --rebase --stat && git submodule update --init rpull-with-submodules = !git pull --rebase --stat && git submodule update --init
freeze = !git-freeze freeze = !git-freeze
tags = log -n1 --pretty=format:%h%d
[merge] [merge]
tool = vimdiff tool = vimdiff
[mergetool "fugitive"] [mergetool "fugitive"]
@ -46,3 +47,5 @@
guitool = kdiff3 guitool = kdiff3
[difftool "kdiff3"] [difftool "kdiff3"]
path = /usr/bin/kdiff3 path = /usr/bin/kdiff3
[pull]
rebase = true