linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed README

Browse Source
This commit is contained in:
l_samenv 2021-02-26 17:05:44 +01:00
parent fad330b71d
commit ab558b3390
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -13,21 +13,15 @@ branches:
- lastsynced: the last synced state between mlz and wip - lastsynced: the last synced state between mlz and wip
lastsynced lastsynced --> master
| | lastsynced --> work --> wip
| |
master work
|
|
wip
apply commits from master to work: (rebase ?) or use cherry-pick: apply commits from master to work: (rebase ?) or use cherry-pick:
git cherry-pick <sha1>..<sha2> git cherry-pick <sha1>..<sha2>
where sha1 is the last commit already in wip, and sha2 ist the last commit to be applied 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), 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 where commits may be cherry picked for input to Gerrit. As generally in the review process some additonal