If your commits are in the "newlines" branch and you have switched back to your "master" branch already, this should do the trick:
git checkout -b tmpsquash
git merge --squash newlines
git commit -a -m "My squashed commits"
git format-patch master
#define NAPI_EXPERIMENTAL | |
#include <assert.h> | |
#include <stdio.h> | |
#include <stdlib.h> | |
#include <string.h> | |
#include <node_api.h> | |
#include <uv.h> |
FROM ubuntu:22.04 | |
RUN apt-get update \ | |
&& DEBIAN_FRONTEND=noninteractive \ | |
apt-get install -y \ | |
build-essential \ | |
curl \ | |
git \ | |
ntp \ | |
postgresql \ |
# src: https://github.com/gjtorikian/html-pipeline/blob/84c75b3d123c5219238c5f01c2b7de7ea73755cd/lib/html/pipeline/sanitization_filter.rb | |
# frozen_string_literal: true | |
HTML::Pipeline.require_dependency('sanitize', 'SanitizationFilter') | |
module HTML | |
class Pipeline | |
# HTML filter with sanization routines and allowlists. This module defines | |
# what HTML is allowed in user provided content and fixes up issues with |
{ | |
"basics": { | |
"name": "Simon Downey", | |
"label": "Developer", | |
"image": "https://raw.githubusercontent.com/gist/sleepdefic1t/e6586a969da06b42bf5d0f00df7fa3ed/raw/e086964551858a538398e0668a4bd13dca54beaa/simon.svg", | |
"email": "[email protected]", | |
"url": "sl33p.eth.link", | |
"summary": "Hello! I'm a crypto dev and technical writer. When I'm not busy programming microcontrollers, documenting Blockchain software, and saving the world from centralization, I enjoy creating music and exploring the latest technological trends.", | |
"location": { | |
"address": "", |
#!/usr/bin/env python3 | |
# /***************************************************************************** | |
# * Copyright (c) ARK Ecosystem <[email protected]> | |
# * | |
# * The MIT License (MIT) | |
# * | |
# * 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 |
{ | |
"data": { | |
"version": 2, | |
"network": 23, | |
"typeGroup": 1, | |
"type": 0, | |
"nonce": "1", | |
"senderPublicKey": "034151a3ec46b5670a682b0a63394f863587d1bc97483b1b6c70eb58e7f0aed192", | |
"fee": "10000000", | |
"amount": "200000000", |
{ | |
"words": [ | |
"AIPs", | |
"ARKies", | |
"ATNG", | |
"Adafruit", | |
"Aewxf", | |
"Aibx", | |
"Airbnb", | |
"Alamofire", |