fixed README

This commit is contained in:
l_samenv 2021-02-26 17:05:44 +01:00
parent fad330b71d
commit ab558b3390

View File

@ -13,21 +13,15 @@ branches:
- lastsynced: the last synced state between mlz and wip
lastsynced
| |
| |
master work
|
|
wip
lastsynced --> master
lastsynced --> work --> wip
apply commits from master to work: (rebase ?) or use cherry-pick:
git cherry-pick <sha1>..<sha2>
where sha1 is the last commit already in wip, and sha2 ist the last commit to be applied
for a single commit <sha1>.. may be omitted
(for a single commit <sha1>.. may be omitted)
the wip branch is also present in an other directory (currently zolliker/switchdrive/gitmlz/frappy),
where commits may be cherry picked for input to Gerrit. As generally in the review process some additonal