From ec93689e16da14940a2fb818f66f17e74d43332e Mon Sep 17 00:00:00 2001
From: JKANetwork <contacto@jkanetwork.com>
Date: Tue, 28 Jun 2016 20:09:23 +0200
Subject: [PATCH] gitdit final update

---
 jka-toolkit/gitdit | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit
index 2d91bdc..67b0bcb 100755
--- a/jka-toolkit/gitdit
+++ b/jka-toolkit/gitdit
@@ -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