thwaller

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.

thwaller

Ctrl + Alt + Space

thwaller

https://bugzilla.redhat.com/show_bug.cgi?id=1478219

1) download radcard script: 

https://raw.githubusercontent.com/superjamie/snippets/master/radcard

2) chmod +x radcard

3) sudo cp radcard /usr/local/bin/radcard

thwaller

#!/usr/bin/env python
#coding=utf-8

import apt
import apt_pkg
from time import strftime
import os
import subprocess
import sys

thwaller

#!/bin/bash

TEXT_RESET='\e[0m'
TEXT_YELLOW='\e[0;33m'
TEXT_RED_B='\e[1;31m'

sudo apt-get update
echo -e $TEXT_YELLOW
echo 'APT update finished...'
echo -e $TEXT_RESET

thwaller

If you're storing anything in MySQL databases that you do not want to lose, it is very important to make regular backups of your data to protect it from loss. This tutorial will show you two easy ways to backup and restore the data in your MySQL database. You can also use this process to move your data to a new web server.

Back up From the Command Line (using mysqldump)

Back up your MySQL Database with Compress

Restoring your MySQL Database

Backing Up and Restoring using PHPMyAdmin

thwaller

# Backup using MySQL Dump
mysqldump --user=root --password=very_strong_password --database mydb > ~/backups/mydb_backup_$(date '+%F_%H%M%S').sql

# Restore
mysql --verbose --user=root --password=very_strong_password mydb < ~/backups/mydb_backup_2011-06-15_085322.sql

thwaller

#!/bin/sh
cd /var/www/YOURSITE.ORG
date=`date +"%b-%d-%y-%H-%M-%S"`
mysqldump -h SERVER_IP -u root -pPASSWORD --skip-extended-insert --skip-dump-date --databases DBNAME > db-backups/YOURSITE.ORG.sql
git add -A
git commit -m "Site backups for $date"
git push
git gc

thwaller

#!/usr/local/bin/bash
db=$1


pwd='pwd'
backupdate=`date`
backupPath='/var/backups/mysql/data/'
dumplog="/var/log/mysqlbackup.log"
errorlog="/tmp/mysqlbackup-error.log"

thwaller

#!/bin/bash
# Shell script to backup MySQL database

# Set these variables
MyUSER=""	# DB_USERNAME
MyPASS=""	# DB_PASSWORD
MyHOST=""	# DB_HOSTNAME

# Backup Dest directory
DEST="" # /home/username/backups/DB