X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fmaster-UPDATE;fp=bin%2Fmaster-UPDATE;h=5c484a6f10ee694d4382cf0f31f701f526a205a1;hp=0000000000000000000000000000000000000000;hb=816e5911d4f26a0c3d69eae262023c53ebe6950d;hpb=9670570a36ec58ed872a55dcc72f9cd756abe038 diff --git a/bin/master-UPDATE b/bin/master-UPDATE new file mode 100755 index 0000000..5c484a6 --- /dev/null +++ b/bin/master-UPDATE @@ -0,0 +1,9 @@ +#! /bin/bash +set -ex +git pull origin +git checkout master +[ "`git status|head -n1`" = "# On branch master" ] +git fetch gdb +git merge gdb/master +git push origin master +echo OK