Posted by jpluimers on 2019/03/05
Below are the git statements I used to solve this ASCII art problem from me (as I work in Git Flow feature
branches):
old situation:
commit-1..4 - commit-5 - commit-6 - commit-7 - commit-8 - commit-9
^ ^ ^ ^ ^
| | | | |
master develop feature/A feature/old
to:
commit-1..4 - commit-5 - commit-6 - commit-7 - commit-8 - commit-9
^ ^ ^ ^ ^
| | | | |
master develop feature/A feature/old feature/new
git branch
git rev-parse HEAD
git log --pretty=format:'%H' -n 2
git checkout -b feature/new hash-of-commit-8
git branch --set-upstream-to=feature/old
git cherry-pick ..feature/old
git branch --force feature/old hash-of-commit-8
Step by step, this is what happens:
branch
lists the current branches
rev-parse HEAD
shows the hash of the current commit (commit-9
)
log --pretty=format:'%H' -n 1
shows the hash of the previous two commits (from top to bottom: commit-9
and commit-8
)
checkout
creates a new branch based on the past commit-8
branch --set-upstream
ensures the new branch tracks the old branch
cherry pick
ensures the new branch gets all the commits from the old branch
branch --force
ensure the old branch looses the extra commits you wanted to only be in newBranchName
Based on
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Power User, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2019/03/05
VMware and USB sticks have two aspects:
- Creating an installable USB stick
- Boot from it and install on another USB stick
Some motherboard and servers offer an internal USB socket to plug in the second stick.
If not, search for “usb 3” motherboard header adapter “usb a”.
Getting the ISO installer on a USB stick to install from
- Download Rufus (I’ve used the portable version from)
- Run Rufus, select ISO image type
- Choose the image (the button on the right of the image type), in my case
VMware-VMvisor-Installer-201701001-4887370.x86_64.iso
from https://my.vmware.com/group/vmware/evalcenter?p=free-esxi6 which Rufus recognises as ESXI-6.5.0-20170104001-STANDARD
:
- Confirm the menu file replacement (note they forgot to translate the
Ja
button to Yes
and Nee
to No
):
---------------------------
Replace menu.c32?
---------------------------
This ISO image seems to use an obsolete version of 'menu.c32'.
Boot menus may not display properly because of this.
A newer version can be downloaded by Rufus to fix this issue:
- Choose 'Yes' to connect to the internet and download the file
- Choose 'No' to leave the existing ISO file unmodified
If you don't know what to do, you should select 'Yes'.
Note: The new file will be downloaded in the current directory and once a 'menu.c32' exists there, it will be reused automatically.
---------------------------
Ja Nee
---------------------------
- If you get this, then just choose
No
in the previous dialog:
---------------------------
File download
---------------------------
Unknown internet error 0x00002F0D
---------------------------
OK
---------------------------
- Confirm erasure of the USB device data (here the
Cancel
button is still Dutch Annuleren
:
---------------------------
Rufus
---------------------------
WARNING: ALL DATA ON DEVICE 'NO_LABEL (F:) [4.1GB]' WILL BE DESTROYED.
To continue with this operation, click OK. To quit click CANCEL.
---------------------------
OK Annuleren
---------------------------
Installing from the USB based installer onto another target USB stick
Yes, you need a second USB to install onto. Which means that it’s best if the two sticks are different models or different brands so it is easier to set them apart.
- Insert both sticks in your machine
- Power on the machine and go into BIOS settings
- Boot from the first
Posted in ESXi6, ESXi6.5, Power User, Virtualization, VMware, VMware ESXi | Leave a Comment »