jkanetwork/jka-toolkit
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-02-15 09:31:32 +01:00
Code Issues Releases Wiki Activity

Update gitdit

Browse Source
This commit is contained in:
JoseluCross
2016-06-29 16:10:10 +02:00
parent fb1ab13c7f
commit 387cfc847a
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jka-toolkit/gitdit
View File

@@ -1,5 +1,4 @@
#!/bin/bash
<<<<<<< HEAD
VERSION="0.2.1"
preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ")
if [ $preOption = "Not" ];then
@@ -8,11 +7,6 @@ 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)"`
actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
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
"p") git pull $actual;;
"s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"`