This is a compilation of common questions about git that I’ve seen online or
have encountered myself. This is a work in progress, so organization isn’t that great.
For all of these, it’s a very good idea to read the man pages before running
them to ensure it will do exactly what you need done.
Undo a merge
git reset --hard ORIG_HEAD
git reset will reset the
HEAD to the specified commit, which
in this case is
ORIG_HEAD. This will be a reference to the commit right
before the merge since
git merge saves the old ...
This post is aimed at setting up a Hurricane Electric IPv6 tunnel on Ubuntu,
but it should be adaptable to other Linux distributions as long as they’re
using Network Manager.
Firstly, you need to install the necessary packages:
curl and optionally
wireless-tools. The latter provides the
iwgetid utility, but I’ll mention
an alternative in the scripts below.
Assuming you’ve already set up a tunnel on
tunnelbroker.net, you should get some details
from the ‘Tunnel Details’ page:
- ENDPOINT is listed as ‘Server IPv4 Address’.
- ADDRESS is the ‘Client IPv6 Address’
- GATEWAY is the ‘Server IPv6 Address’
- TUNNELID ...
This article walks you through encrypting a USB flash drive using LUKS and then
installing UDF on it. If you only want to use UDF without encryption, read my
article on that: Using UDF on Your USB Flash Drive
- you don’t want a partition table on your drive; you want the entire thing to
be just the filesystem
- your drive is
- you use Ubuntu (I ran this on 14.04, but it should be fine on later versions, too)
Firstly, take all your data off your drive since encrypting it will wipe it.
(Optional) Wipe ...
Sometimes your app needs to check if it has access to the wider internet, as
opposed to some WiFi network that’s redirecting all requests to a sign-in page.
There are a few ways of doing this, but this article isn’t about that. This
article is about a new tiny service I just launched called “Am I
I never really needed this feature myself, but I wanted to try out Heroku and
decided this is a perfect way of doing it. The entire application is 9 lines of
Python code (using Flask), and about 30 lines of HTML ...
Yesterday I decided to make a very minimal Pomodoro-style timer to keep me on
track. It doesn’t offer too many features; it just gives you options for the
lengths of time, and 3 buttons to control the timer. If you want to reset the
timer, just refresh the page.
It’s available here: https://80x24.ca/timer
When I said this was very minimal, I didn’t mean just the interface; the code
is very minimal too. There are no dependencies; all necessary code is within
Page 1 of 10
timer.html file. Just put it on a flash drive and ...