jkanetwork/jka-toolkit
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-02-17 18:41:34 +01:00
Code Issues Releases Wiki Activity

changes

Browse Source
This commit is contained in:
kprkpr
2016-06-18 23:10:00 +02:00
parent 9d5e42daea
commit 96a485adb6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jka-toolkit/gitdit
View File

@@ -1,10 +1,10 @@
#!/bin/bash #!/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)"` 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 case $gitopt in
"p") git pull;; "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 if [[ -z $commit ]];then
commit="changes" commit="changes"
fi fi
@@ -22,7 +22,7 @@ case $gitopt in
until [[ $gitbusing && $gitbmerge ]] until [[ $gitbusing && $gitbmerge ]]
do do
gitbusing=`dialog --stdout --inputbox "Rama actual" 10 60` 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 done
git checkout $gitbmerge git checkout $gitbmerge
git merge $gitbusing git merge $gitbusing