[user] [core] editor = vim [alias] ci = commit co = checkout ch = cherry-pick -x br = branch ur = update-ref wt = worktree amend = commit --amend -C HEAD re = rebase ri = rebase -i --autosquash ra = rebase --abort rs = rebase --skip rc = rebase --continue rix = rebase -i -x 'git commit --amend --reset-author -C HEAD' st = status lg = log -p fori = diff --cached --name-only confl = diff --name-only --diff-filter=U puhs = push purr = pull --rebase feta = fetch --all --prune [merge] conflictStyle = diff3 [diff] tool = meld [advice] detachedHead = false [pull] ff = only [push] followTags = true [init] defaultBranch = master