From 8db66d9866da3708b8ed33659b8139d24abc957d Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sat, 29 Nov 2014 11:25:48 +0100 Subject: [PATCH 1/2] oh-my-zsh upgrade --- .oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oh-my-zsh b/.oh-my-zsh index df5b09e2..43aa3783 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit df5b09e20b05a5ba4234599602f7a74934c916db +Subproject commit 43aa3783f8a5606e0f884a43d51daf36553af1e4 From ac85ba918fa59f05512fe55f6c792f79ca5e02dc Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Mon, 8 Dec 2014 11:21:59 +0100 Subject: [PATCH 2/2] added icdiff tool --- .gitmodules | 3 +++ tools/icdiff | 1 + tools/icdiff.git | 1 + 3 files changed, 5 insertions(+) create mode 120000 tools/icdiff create mode 160000 tools/icdiff.git diff --git a/.gitmodules b/.gitmodules index adaec12d..abad11a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,3 +38,6 @@ [submodule ".vim/bundle/vim-ctrlp"] path = .vim/bundle/vim-ctrlp url = https://github.com/kien/ctrlp.vim.git +[submodule "tools/icdiff.git"] + path = tools/icdiff.git + url = https://github.com/jeffkaufman/icdiff.git diff --git a/tools/icdiff b/tools/icdiff new file mode 120000 index 00000000..d7a08b93 --- /dev/null +++ b/tools/icdiff @@ -0,0 +1 @@ +icdiff.git/icdiff \ No newline at end of file diff --git a/tools/icdiff.git b/tools/icdiff.git new file mode 160000 index 00000000..0a27bea0 --- /dev/null +++ b/tools/icdiff.git @@ -0,0 +1 @@ +Subproject commit 0a27bea010fe3be5589840b9850bb0f883f031c7