Skip to content

Git Branches

Jump to bottom
Matthieu Baerts edited this page Feb 24, 2021 · 7 revisions

Different branches on mptcp_net-next repo

  • master → like multipath-tcp/mptcp's mptcp_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 of net-next
  • t/* → other topic: correspond to one commit we want to send upstream, managed by TopGit
  • export → an export of the tree on top of net-next, rebased everyday: what we should send upstream at some points (without the DO-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.

Clone this wiki locally