nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 00:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Split out subtree merges into their own Makefile entries

Browse Source
This commit is contained in:
Paul Gear
2015-03-31 22:34:04 +10:00
parent dc5cfda4ad
commit 1c4326111f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+8 -3
View File
@@ -1,4 +1,5 @@
GIT=git GIT=git
GIT_SUBTREE=$(GIT) subtree pull --squash
SYNC=rsync -rtvx --cvs-exclude --exclude '.*.swp' SYNC=rsync -rtvx --cvs-exclude --exclude '.*.swp'
default: default:
@@ -29,6 +30,10 @@ push-personal pp:
push-testing: push-testing:
$(GIT) push testing $(GIT) push testing
update-subtrees: update-subtrees: datetime-subtree moment-subtree
$(GIT) subtree pull --squash --prefix=html/js/datetime https://github.com/Eonasdan/bootstrap-datetimepicker master
$(GIT) subtree pull --squash --prefix=html/js/moment https://github.com/moment/moment master datetime-subtree:
$(GIT_SUBTREE) --prefix=html/js/datetime https://github.com/Eonasdan/bootstrap-datetimepicker master
moment-subtree:
$(GIT_SUBTREE) --prefix=html/js/moment https://github.com/moment/moment master