jkanetwork/jka-toolkit
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-02-28 07:53:48 +01:00
Code Issues Releases Wiki Activity

up

Browse Source
This commit is contained in:
JoseluCross
2016-06-29 16:08:23 +02:00
parent 9b8508c04e
commit 3cbeaed665
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jka-toolkit/gitdit
View File

@@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
<<<<<<< HEAD
VERSION="0.2.1" VERSION="0.2.1"
preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ") preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ")
if [ $preOption = "Not" ];then if [ $preOption = "Not" ];then
@@ -7,6 +8,11 @@ else
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)" 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)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge)"`
actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")" actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
fi fi
=======
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 a la rama actual)"`
actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
>>>>>>> 2da0286157275673f471fb4fedc9f166b1926275
case $gitopt in case $gitopt in
"p") git pull $actual;; "p") git pull $actual;;
"s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"` "s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"`
@@ -59,7 +65,7 @@ case $gitopt in
let j++ let j++
fi fi
done 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 if [ ! -z $merges ];then
git merge ${lista[$merges]} git merge ${lista[$merges]}
git push git push

3
jka-toolkit/pruebas
View File

@@ -1,3 +0,0 @@
* hotfix
master
pruebas