diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/update-dev.txt (renamed from files/update-dev.sh) | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/files/update-dev.sh b/files/update-dev.txt index 2d5ac2fe..91ff4c1b 100644 --- a/files/update-dev.sh +++ b/files/update-dev.txt @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# Script to reset dev branch to master +# Once it is squashed and merged on github +# Copy this to a sh file, which is gitignored +# So there won't be save conflicts + git checkout dev git cmp hard rebase git branch -f dev-bak dev |