1
0
Fork 0

Autocommitted updated scripts from mari-wovn

main
Mari 5 years ago
parent 6fc3129d3c
commit 57483bd125
  1. 3
      .gitmodules
  2. 4
      per-host/mari-wovn/.bash_aliases
  3. 1
      vim/bundle/YouCompleteMe

3
.gitmodules vendored

@ -16,3 +16,6 @@
[submodule "vim/ale"] [submodule "vim/ale"]
path = vim/bundle/ale path = vim/bundle/ale
url = https://github.com/dense-analysis/ale.git url = https://github.com/dense-analysis/ale.git
[submodule "vim/bundle/YouCompleteMe"]
path = vim/bundle/YouCompleteMe
url = https://github.com/ycm-core/YouCompleteMe.git

@ -32,7 +32,7 @@ function _start_branch() {
if git show-ref --verify --quiet "refs/heads/feature/${branch}"; then if git show-ref --verify --quiet "refs/heads/feature/${branch}"; then
# Local branch exists, but the directory doesn't # Local branch exists, but the directory doesn't
printf "=== Checking out the local branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n" printf "=== Checking out the local branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n"
elif git show-ref --verify --quiet "refs/remote/origin/feature/${branch}"; then elif git show-ref --verify --quiet "refs/remotes/origin/feature/${branch}"; then
# Remote branch exists, but no local branch or directory # Remote branch exists, but no local branch or directory
printf "=== Checking out the remote branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n" printf "=== Checking out the remote branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n"
git branch --track "feature/${branch}" "origin/feature/${branch}" || exit "$?" git branch --track "feature/${branch}" "origin/feature/${branch}" || exit "$?"
@ -136,7 +136,7 @@ function wovn_delete() {
git branch -d "$branch" || exit "$?" git branch -d "$branch" || exit "$?"
); local lastexit="$?" ); local lastexit="$?"
if [[ ! -d "$PWD" ]]; then if [[ ! -d "$PWD" ]]; then
cd ~/equalizer/master cd ~/equalizer
fi fi
return $lastexit return $lastexit
} }

@ -0,0 +1 @@
Subproject commit 170bae7975de1ca3e291b535a5230dcdb46ae274
Loading…
Cancel
Save