diff options
| l--------- | .#merge.sh | 1 | ||||
| -rwxr-xr-x | merge.sh | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.#merge.sh b/.#merge.sh deleted file mode 120000 index 8a4d075a..00000000 --- a/.#merge.sh +++ /dev/null @@ -1 +0,0 @@ -gergo@here.5649
\ No newline at end of file diff --git a/merge.sh b/merge.sh new file mode 100755 index 00000000..8595bcfd --- /dev/null +++ b/merge.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +git checkout master +git pull local/master MaYor-dev + +git checkout MaYor-dev +git merge devel + +git checkout master +git merge MaYor-dev + + |