jackkoenig

Sometimes you want to do the equivalent of a Github Squash-and-Merge without the merge.

I originally had the stuff below the line, but it turns out you can just do this with git merge --squash, see https://gist.github.com/aortbals/2aeb557bf127dd7ae88ea63da93479fc.

git checkout <my branch>
git checkout -b <my branch>-backup
git checkout <base branch>
git pull
# Make sure you have created -backup !!!

jackkoenig

layout	title	section
docs	DataView	chisel3

DataView

New in Chisel 3.5

TheSherlockHomie

Updating expired GPG keys and their backup 🔑🔐💻

I use a GPG key to sign my git commits.

An error like this one might be a sign of an expired GPG key.

error: gpg failed to sign the data fatal: failed to write commit object

jackkoenig

#!/usr/bin/python

import sys
import os
import re
from collections import defaultdict
from split_firrtl import split_firrtl

def get_submods(modules):
    submods = defaultdict(list)

Kovrinic

# one or the other, NOT both

[url "https://github"]
  insteadOf = git://github

# or

[url "git@github.com:"]
  insteadOf = git://github