dotfiles

Obligatory dotfiles repo
git clone git://git.danielmoch.com/dotfiles.git
Log | Files | Refs

commit bc68376a60c1e3029c75617fc74f2728564fe4e8
parent 58e81beb3897744a686e1117fd1b13c3b414d20f
Author: Daniel Moch <daniel@danielmoch.com>
Date:   Sat, 10 Sep 2022 21:16:11 -0400

gitconfig: Multiple changes

- Remove old difftool configs
- Set main as defaultBranch
- Set autoSquash on rebase

Diffstat:
M.gitconfig | 11+++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitconfig b/.gitconfig @@ -6,23 +6,18 @@ excludesfile = ~/.cvsignore [push] default = simple -[diff] - tool = vimdiff -[difftool] - prompt = false -[merge] - tool = vimdiff -[mergetool] - prompt = false [alias] pretty = log --graph --abbrev-commit --pretty=oneline --decorate --all ctags = !`git rev-parse --git-dir`/hooks/ctags po = push -u origin HEAD [init] templatedir = ~/lib/gitdir + defaultBranch = main [include] path = ~/etc/gitconfig.local [pull] rebase = true [sendemail] confirm = auto +[rebase] + autoSquash = true