-
Notifications
You must be signed in to change notification settings - Fork 0
/
README
48 lines (34 loc) · 1.58 KB
/
README
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
How to deal with the PLA subrepository
======================================
Cloning everything
------------------
You have several options:
1) git clone [LearnGLASS.git] [rootdir] --recursive
2) git clone [LearnGLASS.git] [rootdir]
cd [rootdir]
git submodules update --init
3) git clone <LearnGLASS.git> <rootdir>
git submodules init
git submodules update
Note that this will put PLA in (no branch) so any changes you do may get lost since there's no pointer to them.
To change to a branch do:
cd [rootdir]/PLA
git checkout master
Or create other branch.
Pushing changes
---------------
The only time when you need to be careful is if you modify PLA. In this case, pushing the main repo first will point to the previous version of PLA, so if you clone the repo later the changes on PLA will not show. You have to push PLA first and then the main repo for it to retain the changes.
Template files
==============
Some files are not tracked online because they contain private information. Instead, templates to generate your own are available. The list of templates is as follows:
/capture/Cron/crondoit.sh.template
/capture/metadata/User_data/get_userfiles.sh.template
/capture/mgauge/mongoAddUser.php.template
/webapp/tokenkey.php.template
Files that should not be changed
================================
There may be files whose changes shouldn't be uploaded but a default file needs to be in the repository.
To stop git from pushing changes to those files do before staging (git add) them:
git update-index --assume-unchanged <file>
List of these files:
/webapp/config.php