-
-
Notifications
You must be signed in to change notification settings - Fork 43
Git Branches
Matthieu Baerts edited this page Jul 12, 2022
·
7 revisions
-
net-next
→ sync of Netdev's net-next -
net
→ sync of Netdev's net -
t/upstream
→ top of the TopGit tree containing our changes on top ofnet-next
-
t/upstream-net
→ top of the TopGit tree containing our changes on top ofnet
-
t/*
→ other topic: correspond to one commit we want to send upstream, managed by TopGit -
export
→ an export of the tree on top ofnet-next
, rebased everyday: what we should send upstream at some points (without theDO-NOT-MERGE
ones) -
export-net
→ an export of the partial tree on top ofnet
(not including the net-next patches), rebased everyday: what we should send upstream at some points (without theDO-NOT-MERGE
ones) -
for-review
→ same ast/upstream
but without TopGit files: can be use as a base and target for your reviews, easier to rebase -
for-review-net
→ same ast/upstream-net
but without TopGit files: can be use as a base and target for your reviews, easier to rebase
Important: TopGit is used to ease the maintenance and track each modifications, e.g. if we need to modify an existing commit from the export
branch before sending it to netdev. You don't need to use TopGit to send patches.
Simply base your dev branch on top of the for-review
/for-review-net
branches or the export
/export-net
one.
If you work on top of the export
/export-net
branches (instead of the for-review
/for-review-net
ones), use git rebase --onto
or git reset + cherry-pick
to sync with the latest version.
For your information, the TopGit tree is looking like this:
* t/upstream
* (...)
* MPTCP commits for net-next
* (...)
*
|\ --- (...) MPTCP commits only for -net (...) ---- t/upstream-net
| \ /
| * (...)
| * MPTCP commits for -net (and net-next)
| * (...)
* | top of 'net-next' branch
|\ |
| \|
| * top of 'net' branch
| | (...)
To manipulate it, please look at this README