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

Changes in odiwhan (NAME PLEASE)

Browse Source
This commit is contained in:
kprkpr
2016-06-15 20:16:53 +02:00
parent c6ae7677ad
commit 173b11dbf9
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jka-toolkit/odiwhan
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 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)"` gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 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;;
@@ -17,5 +17,13 @@ case $gitopt in
gitbranch=`dialog --stdout --inputbox "Nueva rama/branch" 10 60` gitbranch=`dialog --stdout --inputbox "Nueva rama/branch" 10 60`
git checkout $gitbranch git checkout $gitbranch
;; ;;
"m")
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`
done
git checkout $gitbmerge
git merge $gitbusing
;;
esac esac