commit e32e5e55f35d0131789c90d247cf390c2564c505 parent 91bcedc830d16d1722f7db634f22841601a0b5a0 Author: Alex Balgavy <alexander.balgavy@spaceapplications.com> Date: Fri, 17 May 2024 11:04:54 +0200 gitconfig: rebase pull config leads to problems Diffstat:
M | git/gitconfig | | | 2 | -- |
1 file changed, 0 insertions(+), 2 deletions(-)
diff --git a/git/gitconfig b/git/gitconfig @@ -99,8 +99,6 @@ df = !git --git-dir=$DOTFILES/.git --work-tree=$DOTFILES -[pull] - rebase = true [merge] tool = nvimdiff conflictstyle = diff3