[init] defaultBranch = main [core] editor = nvim [help] autocorrect = 10 [diff] tool = nvimdiff [difftool] prompt = false [merge] tool = nvimdiff [mergetool] keepBackup = false prompt = false [mergetool "nvimdiff"] layout = "LOCAL,MERGED,REMOTE + LOCAL,BASE,REMOTE / MERGED + LOCAL, REMOTE + MERGED + BASE, MERGED" [include] path = ~/.config/.gitlocalconfig [pull] rebase = true [alias] co = checkout comit = commit ocmiit = commit upll = pull upsh = push d = diff dc = diff --cached s = status stat = status l = log --graph --branches