From 96a485adb6442f5f40f93244506a7543456b086a Mon Sep 17 00:00:00 2001 From: kprkpr Date: Sat, 18 Jun 2016 23:10:00 +0200 Subject: [PATCH] changes --- jka-toolkit/gitdit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index 001b0e3..63e87eb 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -1,10 +1,10 @@ #!/bin/bash -VERSION="0.1.1" +VERSION="0.1.2" gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" s "Subir actualizaciones al git (Hacer push)" c "Descargar un nuevo git (Hacer clone)" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge)"` case $gitopt in "p") git pull;; - "s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50` + "s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"` if [[ -z $commit ]];then commit="changes" fi @@ -22,10 +22,10 @@ case $gitopt in until [[ $gitbusing && $gitbmerge ]] do gitbusing=`dialog --stdout --inputbox "Rama actual" 10 60` - gitbmerge=`dialog --stdout --inputbox "Rama con la que unir (la final,normalmente master)" 10 60` + gitbmerge=`dialog --stdout --inputbox "Rama con la que unir (la final,normalmente master)" 10 60 "master"` done git checkout $gitbmerge git merge $gitbusing git push ;; -esac \ No newline at end of file +esac