diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-04 11:13:47 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-07-04 11:13:47 -0700 |
| commit | 4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e (patch) | |
| tree | dec58af06d220ba80920fcf9c816b71413c61108 /files | |
| parent | 43885c6c063a76738ed7220aba619e47db7c4080 (diff) | |
| parent | d6c5bcd56e293eaf281663b6c1e6b0ab7236be9f (diff) | |
| download | frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.gz frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.bz2 frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.zip | |
Fix merge
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 |