-
-
Notifications
You must be signed in to change notification settings - Fork 43
Git Branches
Matthieu Baerts edited this page Feb 24, 2021
·
7 revisions
master
→ like multipath-tcp/mptcp'smptcp_trunk
branch but with less features-
net-next
→ sync of Netdev's net-next -
t/upstream
→ top of the TopGit tree containing our changes on top ofnet-next
-
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) -
for-review
→ same as t/upstream but without TopGit files: can be use as a base and target for your reviews
Important: you don't need to use TopGit to send patches, simply base your dev branch on top of the export
branch (use git rebase --onto
or git reset + cherry-pick
if you need to sync with the latest version) or for-review
. 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 net-dev.