From 25c86dbc1c7b9b475e5885799d5287f2f9972f38 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Tue, 27 Jun 2023 15:21:28 +0300 Subject: [PATCH] asdf --- .DS_Store | Bin 6148 -> 6148 bytes br.sh | 12 ++++++++++++ master.sh | 12 ++++++++++++ models/.DS_Store | Bin 6148 -> 6148 bytes models/{2 => 1}/sldemo_autotrans.slx | Bin models/{test.txt => test_renamed.txt} | 0 6 files changed, 24 insertions(+) create mode 100644 br.sh create mode 100644 master.sh rename models/{2 => 1}/sldemo_autotrans.slx (100%) rename models/{test.txt => test_renamed.txt} (100%) diff --git a/.DS_Store b/.DS_Store index b09cf81cced68228c9b5db76f9da9e10060f0a8f..c5fb584c283f8f7ed2d16ae552d39db9ef19406c 100644 GIT binary patch delta 70 zcmZoMXfc@JFUrBdz`)4BAi%(o!;qR%oSc)CpP#dNBlB`bDUcK!LpnndLn1>8vNYpn O9;QdEo7p-3@&f=zED{I+ delta 48 zcmZoMXfc@JFUroqz`)4BAi%(o!%&=5UR;orlb^KtBJ*-aM)u9BOpjP6Hb`z}=lIJH E04CWDp8x;= 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 26d864850dd01f2aac047ffceed16e53cdf59a52..d1dfde2d7b16b1ccb4157ccb38b3659c648cc965 100644 GIT binary patch delta 63 zcmZoMXfc@J&%?#Qz`)4BAi$8H!!R*=g8+nYm{Odalavn>n=H+k#tGvwZmwpmW!uco H@s}R}%`gyk delta 60 zcmZoMXfc@J&%?>Uz`)4BAi$8H!#FW|g8+nYm{Odalavn>n=H+kHd&ETbn{ZiB({kS L{F~W1{_+C=m!1z2 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