From ab67a5aa035a91f2a3ef47dc8457ba4ad4dba3b9 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Sat, 9 Jun 2012 17:43:55 -0400 Subject: [PATCH 1/2] Added submodule for javacomplete. --- .gitmodules | 3 +++ config.sh | 4 +++- vim/javacomplete | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 vim/javacomplete diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..125c485 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vim/javacomplete"] + path = vim/javacomplete + url = git://github.com/ntietz/javacomplete.git diff --git a/config.sh b/config.sh index 7e859ec..8eb05e9 100755 --- a/config.sh +++ b/config.sh @@ -14,6 +14,8 @@ rm -f .vimrc ln -s ~/Repositories/config/vimrc .vimrc # set up the default branch for git -git config --global branch.master.remote origin +git config --global branch.master.remote github git config --global branch.master.merge refs/heads/master +mkdir -p .vim + diff --git a/vim/javacomplete b/vim/javacomplete new file mode 160000 index 0000000..f3d9ce9 --- /dev/null +++ b/vim/javacomplete @@ -0,0 +1 @@ +Subproject commit f3d9ce93b4452baf5cb15b68d3b2a925a10a6e7d From 2471936a1d51eb633a583caa0d60beb484ecf1af Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Sun, 10 Jun 2012 03:07:52 -0400 Subject: [PATCH 2/2] Removed module. --- .gitmodules | 4 +--- config.sh | 3 ++- vim/javacomplete | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 160000 vim/javacomplete diff --git a/.gitmodules b/.gitmodules index 125c485..8b13789 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1 @@ -[submodule "vim/javacomplete"] - path = vim/javacomplete - url = git://github.com/ntietz/javacomplete.git + diff --git a/config.sh b/config.sh index 8eb05e9..781e063 100755 --- a/config.sh +++ b/config.sh @@ -17,5 +17,6 @@ ln -s ~/Repositories/config/vimrc .vimrc git config --global branch.master.remote github git config --global branch.master.merge refs/heads/master -mkdir -p .vim +rm -rf .vim +ln -s ~/Repositories/config/vim .vim diff --git a/vim/javacomplete b/vim/javacomplete deleted file mode 160000 index f3d9ce9..0000000 --- a/vim/javacomplete +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3d9ce93b4452baf5cb15b68d3b2a925a10a6e7d