Daniel Graña dangra

## merge_vs_rebase_vs_squash.md

      
              1 file
            
          
              6 forks
            
          
              3 comments
            
          
              197 stars
            
          
                mitchellh
                / merge_vs_rebase_vs_squash.md
            
            
              Last active
              May 10, 2024 19:51
            
              
                Merge vs. Rebase vs. Squash
              
          
    I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing.
I've typed up this response so many times that I've decided to just put it in a gist so
I can reference it whenever it comes up again.

I use merge, squash, rebase all situationally. I believe they all have their merits
but their usage depends on the context. I think anyone who says any particular strategy
is the right answer 100% of the time is wrong, but I think there is considerable
acceptable leeway in when you use each. What follows is my personal and professional
opinion:


## Autofill OTP on Tunnelblick.md

      
              1 file
            
          
              1 fork
            
          
              1 comment
            
          
              2 stars
            
          
                dangra
                / Autofill OTP on Tunnelblick.md
            
            
              Last active
              July 20, 2023 23:20
            
          
    Autofill OpenVPN OTP

On MacOS with Tunnelblick.
brew install oath-toolkit
mkdir ~/Documents/my-vpn.tblk
cp ~/Downloads/profile.ovpn ~/Documents/my-vpn.tblk/
printf "#!/bin/bash\n/usr/local/bin/oathtool --totp -b -d 6 {OTP_KEY_HERE}" > ~/Documents/my-vpn.tblk/static-challenge-response.user.sh
chmod +x ~/Documents/my-vpn.tblk/static-challenge-response.user.sh


## docker-compile.pl
#!/usr/bin/env perl

use feature 'switch';
use strict;
use warnings;

use Data::Dumper;
use File::Basename;
use File::Copy;
use File::Path qw/make_path/;

## formtest.py
from scrapy.http.response.text import TextResponse

# import form
import lxmlform
import lxmlform_noxmlns

l = ['<html><body><form><select name="hugeselect">']
for i in range(1000):
    l.append('<option value="%s">%s</option>' %(i,i))
l.append('<option selected="selected" value="selected">selected</option>')
	#!/usr/bin/env perl

	use feature 'switch';
	use strict;
	use warnings;

	use Data::Dumper;
	use File::Basename;
	use File::Copy;
	use File::Path qw/make_path/;
	from scrapy.http.response.text import TextResponse

	# import form
	import lxmlform
	import lxmlform_noxmlns

	l = ['<html><body><form><select name="hugeselect">']
	for i in range(1000):
	l.append('<option value="%s">%s</option>' %(i,i))
	l.append('<option selected="selected" value="selected">selected</option>')