浏览代码

gitconfig not suitable for dotfile management

Kevin 6 年之前
父节点
当前提交
d34e2a615e
共有 2 个文件被更改,包括 3 次插入19 次删除
  1. 0 18
      gitconfig
  2. 3 1
      install.conf.yaml

+ 0 - 18
gitconfig

@@ -1,18 +0,0 @@
-# This is Git's per-user configuration file.
-[user]
-# Please adapt and uncomment the following lines:
-#	name = Kevin Heinicke
-#	email = kheinicke@kheinick-mbp2.dyndns.cern.ch
-[user]
-	email = kevin@kehei.de
-	name = Kevin Heinicke
-[core]
-	excludesfile = /Users/kheinicke/.gitignore_global
-[diff]
-	tool = opendiff
-[difftool]
-	prompt = false
-[difftool "opendiff"]
-    cmd = opendiff \"$LOCAL\" \"$REMOTE\" -merge \"$MERGED\" | cat
-[merge]
-	tool = opendiff

+ 3 - 1
install.conf.yaml

@@ -4,6 +4,9 @@
     - [git submodule update --init --recursive, Installing submodules]
     - [git submodule update --init --recursive, Installing submodules]
     - ["mkdir -p ~/.config/nvim/{backup,swap,undo}", Creating nvim backup dirs]
     - ["mkdir -p ~/.config/nvim/{backup,swap,undo}", Creating nvim backup dirs]
     - ["touch ~/.config/nvim/local.vimrc", Touching local vimrc]
     - ["touch ~/.config/nvim/local.vimrc", Touching local vimrc]
+    - ["git config --global user.email kevin@kehei.de"]
+    - ["git config --global user.name Kevin\ Heinicke"]
+    - ["git config --global core.excludesfile ~/.gitignore_global"]
 
 
 - link:
 - link:
     ~/.dotfiles: ''
     ~/.dotfiles: ''
@@ -28,5 +31,4 @@
     ~/.zprezto:
     ~/.zprezto:
         relink: true
         relink: true
         path: external/prezto/
         path: external/prezto/
-    ~/.gitconfig: gitconfig
     ~/.gitignore_global: gitignore_global
     ~/.gitignore_global: gitignore_global