diff options
| -rw-r--r-- | dotfiles/gitconfig | 21 | ||||
| -rw-r--r-- | install.conf.yaml | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig new file mode 100644 index 0000000..3b81720 --- /dev/null +++ b/dotfiles/gitconfig @@ -0,0 +1,21 @@ +[user] + name = Anton Khirnov + email = anton@khirnov.net +[sendemail] + chainreplyto = false + envelopesender = auto + suppresscc = self + confirm = always +[merge] + tool = vimdiff +[core] + pager = less -FRX +[alias] + brlog = log -p --reverse origin/master..HEAD +[diff] + renames = copy + colorMoved = true +[pull] + ff = only +[pretty] + summary = format:%C(auto)%h%Creset %cs %<|(48)%C(brightyellow)%an%Creset %s diff --git a/install.conf.yaml b/install.conf.yaml index efd707d..afebf08 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -5,6 +5,7 @@ - ~/.vim/colors - link: + ~/.gitconfig: dotfiles/gitconfig ~/.tmux.conf: dotfiles/tmux.conf # TODO: clean up and install linediff script ~/.vimrc: vim/vimrc |