-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathREADME
45 lines (34 loc) · 1.02 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
Testing of a method for vendor branch tracking.
Method used:
* Created a 'vendor' branch off base of repository with no parent
git symbolic-ref HEAD refs/heads/newbranch
rm .git/index
git clean -fdx
<do work>
git add your files
git commit -m 'Initial commit'
* Create the structure we want for all deps in that branch
* Keep copies of all vendor drops in that branch in the directory structure we want
* Merge 'vendor' into 'dev' to get all changes
git checkout vendor
git pull
git checkout dev
git merge --no-ff -m "Merge in of package x.y.z from vendor" vendor
git push # To upload to server
* As updates happen:
* Go into vendor
git checkout vendor
cd deps
# First time
unzip package.x.y.z.zip
mv package.x.y.z package
git add package
git commit -a -m "Import of Package X.Y.Z"
git push origin vendor
# Second time
rm -rf package
unzip package.x.y.z.zip
mv package.x.y.z package
# Make sure files are in place
git commit -a -m "Import of Package X.Y.Z"
git push origin vendor