projects
/
dotvim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2537dcd
)
aufräumen wird nicht mehr benötigt
author
Tobias Sachs
<src.twobees.de-co0Chie-ts@ctsachs.de>
Fri, 21 Aug 2020 13:17:51 +0000
(15:17 +0200)
committer
Tobias Sachs
<src.twobees.de-co0Chie-ts@ctsachs.de>
Fri, 21 Aug 2020 13:17:51 +0000
(15:17 +0200)
myinit.sh
patch
|
blob
|
history
diff --git
a/myinit.sh
b/myinit.sh
index 61f18fd4d25929a8fc3f302a76e554c746567a82..aa072b29a6f303428cc84f6d4a82de9f12c0ea04 100644
(file)
--- a/
myinit.sh
+++ b/
myinit.sh
@@
-1,17
+1,6
@@
#!/usr/bin/env bash
git stash
-
-# alten hook loeschen...
-oldhook=".git/hooks/post-merge"
-if [ -h $oldhook ]; then
- actual=`readlink $oldhook`
- if [ "$actual" = "../../myinit.sh" ]; then
- rm -v -f $oldhook
- fi
-fi
-# alten hook loeschen kann bestimmt bald wieder weg...
-
-git pull
+git pull
git stash pop
if [ -d bundle/Vundle.vim ];then