jkanetwork/jka-toolkit
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-06-13 03:36:31 +02:00
Code Issues Releases Wiki Activity

gitdit final update

Browse Source
This commit is contained in:
JKA Network
2016-06-28 20:09:23 +02:00
parent 3d74332d82
commit ec93689e16
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jka-toolkit/gitdit
+2 -2
View File
@@ -1,6 +1,6 @@
#!/bin/bash
VERSION="0.2.0"
gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" c "Descargar un nuevo git (Hacer clone)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge)"`
gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" c "Descargar un nuevo git (Hacer clone)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge a la rama actual)"`
actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
case $gitopt in
"p") git pull $actual;;
@@ -54,7 +54,7 @@ case $gitopt in
let j++
fi
done
merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir" 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
git merge ${lista[$merges]}
git push