jkanetwork/jka-toolkit
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-02-17 18:41:34 +01:00
Code Issues Releases Wiki Activity

Add $actual in merge option (before it isn't there)

Browse Source
This commit is contained in:
JoseluCross
2016-06-30 13:14:41 +02:00
parent e03f248833
commit 786f3bcea2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jka-toolkit/gitdit
View File

@@ -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` 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 if [ ! -z $merges ];then
git merge ${lista[$merges]} git merge ${lista[$merges]}
git push git push $actual
fi fi
;; ;;
esac esac