A common issue during a branch rebase:
- merging multiple commits is pretty easy with the
squash
action - splitting a commit in smaller ones can be a pain in the *ss, especially if the changes are inside a common file.
An example of "to split" commit:
pre required SSH access | |
## Download and install acme.sh | |
acme.sh is a full implementation of a LetsEncrypt client but that doesn't depend on Python/pip/virtualenv/etc, and that doesn't require root -- exactly what we need, since we don't have root an a shared GoDaddy server, and we can't install new software outside of our home directory. | |
`curl https://get.acme.sh | sh` | |
Now log out and SSH back in so acme.sh's install is complete in every way (include the Bash alias). | |
##Get GoDaddy API Key | |
Visit `https://developer.godaddy.com/keys/` |
; https://github.com/n4sm/AD_1DA/tree/master/AD_1DA | |
BITS 64 | |
section .text | |
global _start | |
_start: | |
mov r13, 0x1111111111111111 |
A common issue during a branch rebase:
squash
actionAn example of "to split" commit:
This guide provides instructions for an Arch Linux installation featuring full-disk encryption via LVM on LUKS and an encrypted boot partition (GRUB) for UEFI systems.
Following the main installation are further instructions to harden against Evil Maid attacks via UEFI Secure Boot custom key enrollment and self-signed kernel and bootloader.
You will find most of this information pulled from the Arch Wiki and other resources linked thereof.
Note: The system was installed on an NVMe SSD, substitute /dev/nvme0nX
with /dev/sdX
or your device as needed.
#!/bin/bash | |
# On my machine VLC fails to connect to chromecast. If I specify the IP it fails to connect because of certificate errors. I can | |
# manually download the certificate but it is only valid for 2 days. This little script gets it all working. | |
# Set your ip address below and call this script with the filename. | |
CHROMECAST_IP=192.168.1.153 | |
gnutls-cli --save-cert=chromecast.pem --insecure $CHROMECAST_IP:8009 | |
mkdir -p ~/.local/share/vlc/certs | |
mv chromecast.pem ~/.local/share/vlc/certs |
MIT License | |
Copyright (c) 2018 Noel Bundick | |
Permission is hereby granted, free of charge, to any person obtaining a copy | |
of this software and associated documentation files (the "Software"), to deal | |
in the Software without restriction, including without limitation the rights | |
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
copies of the Software, and to permit persons to whom the Software is | |
furnished to do so, subject to the following conditions: |