mirror of
https://gitlab.com/JKANetwork/jka-toolkit.git
synced 2026-02-15 17:41:31 +01:00
Add $actual in merge option (before it isn't there)
This commit is contained in:
@@ -101,7 +101,7 @@ if [ ! -z $gitopt ];then #No canceled
|
||||
merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir a $(git branch --list | grep "^*" | cut -f2 -d" ")" 0 0 6 $rama`
|
||||
if [ ! -z $merges ];then
|
||||
git merge ${lista[$merges]}
|
||||
git push
|
||||
git push $actual
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user