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