diff options
| author |  Tom van der Lee <t0m.vd.l33@gmail.com> | 2015-08-19 14:19:40 +0200 |
|---|---|---|
| committer | Tom van der Lee <t0m.vd.l33@gmail.com> | 2015-08-19 14:19:40 +0200 |
| commit | 344ce46b48a1b6920fcbbb4b308973f8441fa563 (patch) | |
| tree | 4bdd66a6dc4d366beb3ae4d9b8ee1675b9b3c8b3 | |
| parent | 65d35ade50a86fc3ab146057213755cc74310885 (diff) | |
| parent | 412b3998f8bd7fa3feec1550e72df7b91fa9b886 (diff) | |
| download | dotfiles-344ce46b48a1b6920fcbbb4b308973f8441fa563.tar.gz dotfiles-344ce46b48a1b6920fcbbb4b308973f8441fa563.tar.bz2 dotfiles-344ce46b48a1b6920fcbbb4b308973f8441fa563.zip | |
Merge branch 'master' into hlwm_refactoring
| -rw-r--r-- | git/.gitconfig | 2 | ||||
| l--------- | neovim/.nvim | 1 | ||||
| l--------- | neovim/.nvimrc | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index ddd2bb4..6f7db4e 100644 --- a/git/.gitconfig +++ b/git/.gitconfig | |||
| @@ -7,3 +7,5 @@ | |||
| 7 | st = status -s | 7 | st = status -s |
| 8 | siu = "!f() { git submodule init && git submodule update; }; f" | 8 | siu = "!f() { git submodule init && git submodule update; }; f" |
| 9 | ls = ls-files | 9 | ls = ls-files |
| 10 | [push] | ||
| 11 | default = matching | ||
diff --git a/neovim/.nvim b/neovim/.nvim new file mode 120000 index 0000000..3ec36e2 --- /dev/null +++ b/neovim/.nvim | |||
| @@ -0,0 +1 @@ | |||
| ../vim/.vim \ No newline at end of file | |||
diff --git a/neovim/.nvimrc b/neovim/.nvimrc new file mode 120000 index 0000000..988ed4f --- /dev/null +++ b/neovim/.nvimrc | |||
| @@ -0,0 +1 @@ | |||
| ../vim/.vimrc \ No newline at end of file | |||