summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2013-12-14 10:18:59 +0100
committerAchim Gratz <Stromeko@Stromeko.DE>2013-12-14 10:35:13 +0100
commit01b42f91de53e83108a195765d322e6f5add1676 (patch)
tree4b2aa92552c0f06d0d4cfc227d74dc92f5d50035
parent49c128c30045255aae76b7cd152de4b80bd1bdd4 (diff)
downloadorg-mode-01b42f91de53e83108a195765d322e6f5add1676.tar.gz
Makefile: optionally switch to a specific git branch
* mk/default.mk (GIT_BRANCH): New configuration variable to specify a Git branch that is checked out before updating. * mk/targets.mk (up0 up1 up2): Check out the branch in GIT_BRANCH before doing an update. Stays on the current branch if GIT_BRANCH is undefined or empty.
-rw-r--r--mk/default.mk4
-rw-r--r--mk/targets.mk1
2 files changed, 5 insertions, 0 deletions
diff --git a/mk/default.mk b/mk/default.mk
index fecb0b5..72068d1 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -22,6 +22,10 @@ infodir = $(prefix)/info
# Define if you only need info documentation, the default includes html and pdf
#ORG_MAKE_DOC = info # html pdf
+# Define which git branch to switch to during update. Does not switch
+# the branch when undefined.
+GIT_BRANCH =
+
# Define if you want to include some (or all) files from contrib/lisp
# just the filename please (no path prefix, no .el suffix), maybe with globbing
#ORG_ADD_CONTRIB = ox-* # e.g. the contributed exporter
diff --git a/mk/targets.mk b/mk/targets.mk
index 27f4146..1936966 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -108,6 +108,7 @@ endif
up0:: cleanaddcontrib
up0 up1 up2::
+ git checkout $(GIT_BRANCH)
git remote update
git pull
up1 up2:: all