mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #696 from paulgear/master

Browse Source 
Add separate Makefile entries for subtree merges
This commit is contained in:
Neil Lathwood
2015-03-31 14:05:12 +01:00
parent 6b2e11dca7 f4fa655846
commit 70ca7f9a43
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -1,4 +1,5 @@
GIT=git
GIT_SUBTREE=$(GIT) subtree pull --squash
SYNC=rsync -rtvx --cvs-exclude --exclude '.*.swp'
default:
@@ -29,6 +30,10 @@ push-personal pp:
push-testing:
$(GIT) push testing
update-subtrees:
$(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
update-subtrees: datetime-subtree moment-subtree
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