From 387cfc847af84a3a225c40a30534df7f1833b4fb Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Wed, 29 Jun 2016 16:10:10 +0200 Subject: [PATCH] Update gitdit --- jka-toolkit/gitdit | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index ee1f3f2..b2d7975 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -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"`