diff --git a/.DS_Store b/.DS_Store index b09cf81c..c5fb584c 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/br.sh b/br.sh new file mode 100644 index 00000000..6e9e4567 --- /dev/null +++ b/br.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +git checkout master +git pull +git checkout -b $1 +echo a > $1 +git add $1 +git commit -m 1 +echo b >> $1 +git add $1 +git commit -m 2 +git push --set-upstream origin $1 \ No newline at end of file diff --git a/master.sh b/master.sh new file mode 100644 index 00000000..65c2df73 --- /dev/null +++ b/master.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +git checkout master +git pull +echo a > $1 +echo b >> $1 +git add $1 +git commit -m m +git push +git checkout - +git merge master --no-ff +git push \ No newline at end of file diff --git a/models/.DS_Store b/models/.DS_Store index 26d86485..d1dfde2d 100644 Binary files a/models/.DS_Store and b/models/.DS_Store differ diff --git a/models/2/sldemo_autotrans.slx b/models/1/sldemo_autotrans.slx similarity index 100% rename from models/2/sldemo_autotrans.slx rename to models/1/sldemo_autotrans.slx diff --git a/models/test.txt b/models/test_renamed.txt similarity index 100% rename from models/test.txt rename to models/test_renamed.txt