chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b64b742
)
Makefile: "push": Change default branch to "main"
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Apr 2021 17:26:25 +0000
(18:26 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Apr 2021 17:26:25 +0000
(18:26 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 0782e9c956552ac6a5a87b58df3b236cf7cec343..e157f231761e1b5027a5704a0759150b13c99ec3 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-382,8
+382,8
@@
deploy: for-deploy bundled-sources assets libraries
rsync -r nwtemplates/*.tera $(DEPLOY_BASE)/nwtemplates/
ssh -o BatchMode=true $(DEPLOY_USER) $(DEPLOY_FINISH)
git branch -f $(DEPLOYED_BRANCH)
- -git push origin ma
ster
- -git push chiark ma
ster
+ -git push origin ma
in
+ -git push chiark ma
in
#$(DEPLOY_BASE)/bundled-sources