diff options
| -rwxr-xr-x | rebase-branches.sh | 4 | ||||
| -rwxr-xr-x | update-branches.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rebase-branches.sh b/rebase-branches.sh deleted file mode 100755 index 0fb1ac6..0000000 --- a/rebase-branches.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -git checkout pc && git rebase master -git checkout laptop && git rebase master -git checkout master diff --git a/update-branches.sh b/update-branches.sh new file mode 100755 index 0000000..8008cb1 --- /dev/null +++ b/update-branches.sh @@ -0,0 +1,4 @@ +#!/bin/sh +git checkout pc && git merge master +git checkout laptop && git merge master +git checkout master |