diff options
| l--------- | .#merge.sh | 1 | ||||
| -rwxr-xr-x | checkupdate.sh | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.#merge.sh b/.#merge.sh new file mode 120000 index 00000000..8a4d075a --- /dev/null +++ b/.#merge.sh @@ -0,0 +1 @@ +gergo@here.5649
\ No newline at end of file diff --git a/checkupdate.sh b/checkupdate.sh index 47febde4..8c363232 100755 --- a/checkupdate.sh +++ b/checkupdate.sh @@ -1,7 +1,8 @@ #!/bin/bash -git checkout MaYor-dev +#git checkout MaYor-dev +git checkout master if [ $? == 0 ]; then orev=$(cat rev.txt) @@ -40,7 +41,7 @@ if [ $? == 0 ]; then fi - git checkout @{-1} +# git checkout @{-1} fi -
\ No newline at end of file + |