msrose

Combining two git repositories

Use case: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:

• preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
• actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location

NB: Check out git subtree/git submodule and this Stack Overflow question before going through the steps below. This gist is just a record of how I solved this problem on my own one day.

Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.

JeffPaine

i3 Window Manager Cheat Sheet

$mod refers to the modifier key (alt by default)

General

• startx i3 start i3 from command line
• $mod+<Enter> open a terminal
• $mod+d open dmenu (text based program launcher)
• $mod+r resize mode ( or to leave resize mode)
• $mod+shift+e exit i3

ourmaninamsterdam

The MIT License (MIT)

Copyright (c) 2015 Justin Perry

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:

leeor

#!/bin/bash
set -e

# Merge this repo
SRCREPO=$1; shift
# into this one
DSTREPO=$1; shift
# at this path
BASENAME=$1; shift
# and apply this patch when done

thomasheller

Install Arch Linux in VirtualBox

Quick install guide for Arch -- if you're looking for an automated installer, consider Arch Anywhere.

Download

Download the latest version from: https://www.archlinux.org/download/

EvieePy

"""
If you are not using this inside a cog, add the event decorator e.g:
@bot.event
async def on_command_error(ctx, error)

For examples of cogs see:
https://gist.github.com/EvieePy/d78c061a4798ae81be9825468fe146be

For a list of exceptions:
https://discordpy.readthedocs.io/en/latest/ext/commands/api.html#exceptions

EvieePy

import discord
from discord.ext import commands

import sys, traceback

"""This is a multi file example showcasing many features of the command extension and the use of cogs.
These are examples only and are not intended to be used as a fully functioning bot. Rather they should give you a basic
understanding and platform for creating your own bot.

These examples make use of Python 3.6.2 and the rewrite version on the lib.

jegfish

# asyncpg docs: https://magicstack.github.io/asyncpg/current/

# This uses discord.py rewrite branch and .format(). If you are using the async branch of discord.py, it shouldn't matter much
# as only 'await ctx.send()' is something you should need to change. If you are using python 3.6+, you can use f strings as opposed to
# .format() for increased efficiency.

import discord
from discord.ext import commands
import asyncio
import asyncpg

AvasDream

Purpose

Cheatsheet for HackTheBox with common things to do while solving these CTF challenges.

Because a smart man once said:

Never google twice.

Linux General

Stepland

import requests
import time
import sys
import argparse
import pickle
import json

class RedactedAPIError(Exception):
    pass