From f68e6024a8abd07a1fcf01a861c5d5d77806220f Mon Sep 17 00:00:00 2001
From: JoseluCross <jlgarrido97@gmail.com>
Date: Tue, 28 Jun 2016 16:05:01 +0200
Subject: [PATCH] Update gitdit

---
 jka-toolkit/gitdit  | 8 ++++----
 jka-toolkit/pruebas | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 jka-toolkit/pruebas

diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit
index 9cfdf2c..fce9a71 100755
--- a/jka-toolkit/gitdit
+++ b/jka-toolkit/gitdit
@@ -1,15 +1,14 @@
 #!/bin/bash
 VERSION="0.1.3"
 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)"`
-brunch=`git branch --list`
-actual="origin $($brunch | grep "^*" | cut -f1 -d" ")"
+actual="origin $(git branch --list | grep "^*" | cut -f1 -d" ")"
 case $gitopt in
 	"p")	git pull $actual;;
 	"s")	commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
 		if [[ -z $commit ]];then
 			commit="changes"
 		fi
-		git add . && git commit -m "$commit" && git push
+		git add . && git commit -m "$commit" && git push $actual
 		;;
 	"c")
 		giturl=`dialog --stdout --inputbox  "URL del git" 10 60`
@@ -18,7 +17,7 @@ case $gitopt in
 	"b")
 		j=0
 		rama=""
-		for i in $($brunch)
+		for i in $(git branch --list | grep "^*" -v )
 		do
 			if [ $i != "*" ];then
 				rama="$rama $j $i"
@@ -28,6 +27,7 @@ case $gitopt in
 		done
 		ramificacion=`dialog --stdout --scrollbar --menu "Selecione la rama" 0 0 6 $rama`
 		git checkout ${lista[$ramificacion]}
+		;;
 	"m")
 		until [[ $gitbusing && $gitbmerge ]]
 		do
diff --git a/jka-toolkit/pruebas b/jka-toolkit/pruebas
new file mode 100644
index 0000000..8b63174
--- /dev/null
+++ b/jka-toolkit/pruebas
@@ -0,0 +1,3 @@
+* hotfix
+  master
+  pruebas