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
49
50
51
52
53
54
55
56
57
|
== git subrepo clone git@genius --branch=bob ext/genius
- create orphan branch repo/genius
- fetch git@genius --branch=bob
- create local branch repo/genius
- checkout repo/genius into ext/genius
- SYNC-DANCE:
- add ext/genius/.gitrepo
- commit the add and prune the commit
- merge the pruned commit into mianline
== git subrepo pull ext/genius
- checkout ext/genius
- fetch git@genius --branch=bob
- merge/rebase FETCH_HEAD
- commit if merge successful
- checkout original branch
- SYNC-DANCE
== git subrepo branch ext/genius
- filter-branch subdir ext/genius
- filter-branch 'rm .gitrepo'
- add parent of original
- name the commit subrepo/ext/genius
== git subrepo checkout ext/genius
- subrepo branch ext/genius
- checkout subrepo/ext/genius
== git subrepo push ext/genius
- subrepo branch ext/genius
- checkout repo/genius
- merge/rebase subrepo/ext/genius
- push repo/genius git@genius/bob
- checkout original
= Commands =
git subrepo clone git@github.com:ingydotnet/bashplus.git
git subrepo clone git@github.com:ingydotnet/bashplus.git ext/bashplus
git subrepo clone git@github.com:ingydotnet/bashplus.git --branch=devel
git subrepo clone git@github.com:ingydotnet/bashplus.git --reclone
git subrepo pull git@github.com:ingydotnet/bashplus.git
git subrepo pull git@github.com:ingydotnet/bashplus.git --branch=master
git subrepo pull git@github.com:ingydotnet/bashplus.git --rebase
git subrepo branch ext/bashplus # create refs/heads/subrepo/ext/bashplus
git subrepo checkout ext/bashplus
git subrepo push ext/bashplus
|
