diff options
| author | Karel Kočí <karel.koci@nic.cz> | 2016-08-12 17:26:12 +0200 |
|---|---|---|
| committer | Karel Kočí <karel.koci@nic.cz> | 2016-08-12 17:26:12 +0200 |
| commit | ae4600e31f53a5775c5008b2c8633d8450be56bf (patch) | |
| tree | 299cc076619f088cf97db42931d44ad6738caed9 /gitconfig | |
| parent | 6ad7a2ece1069bbd2bc450cbcc7b79b8a825aa49 (diff) | |
| download | myconfigs-ae4600e31f53a5775c5008b2c8633d8450be56bf.tar.gz myconfigs-ae4600e31f53a5775c5008b2c8633d8450be56bf.tar.bz2 myconfigs-ae4600e31f53a5775c5008b2c8633d8450be56bf.zip | |
Various fixes collected in some time
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -5,3 +5,7 @@ default = simple [core] editor = vim +[commit] + gpgsign = true +[merge] + tool = vimdiff |