Stephen Jennings jennings

git rebase --onto master branch-base branch-head

git checkout base-branch
git cherry-pick A..B

Setting up RhodeCode on Ubuntu Server 12.04

Click here
Click OK on the warning, the file will be downloaded.
Open chrome://extensions and drag the downloaded file onto the extensions page.

	:: Sleep for N seconds:

	ping localhost -n N -w 1



	:: Get the date and time (US LOCALE ONLY)

	set YEAR=%DATE:~-4,4%
	set TWOYEAR=%DATE:~-2,2%

	--- While composing an update query, it's useful to use
	--- a SELECT statement first to make sure you're going to
	--- update the correct rows. Formatting the query in
	--- this manner lets you alternate between SELECT and UPDATE
	--- without commenting and uncommenting parts of the query.

	SELECT *
	FROM

	-- UPDATE TableToUpdate --- Use ALT + Drag to highlight this update

	# Lots of these are from https://github.com/pangratz/osx-defaults

	# Allow key repeat instead of pop-up accent selector in OS X 10.8
	defaults write -g ApplePressAndHoldEnabled -bool false

	# Always show scrollbars
	defaults write NSGlobalDomain AppleShowScrollBars -string "Always"

	# Show the ~/Library folder
	chflags nohidden ~/Library

	@echo off

	pushd \\live.sysinternals.com\tools
	xcopy * %~dp0 /Y /D
	popd

	# From: http://naleid.com/blog/2012/01/17/finding-and-purging-big-files-from-git-history/

	git rev-list --objects --all \| sort -k 2 > allfileshas.txt

	git gc && git verify-pack -v .git/objects/pack/pack-*.idx \| egrep "^\w+ blob\W+[0-9]+ [0-9]+ [0-9]+$" \| sort -k 3 -n -r > bigobjects.txt

	for SHA in `cut -f 1 -d\ < bigobjects.txt`; do
	echo $(grep $SHA bigobjects.txt) $(grep $SHA allfileshas.txt) \| awk '{one=$1; three=$3;$1=$2=$3=$4=$5=$6=""; print one,three,$0}' >> bigtosmall.txt
	done;

	#!/bin/sh

	# Combines together unrelated branches into the current commit.
	#
	# Usage: combine-unrelated-branches.sh <merge-head>+
	#
	# combine-unrelated-branches.sh repo1/stuff repo2/stuff

	NEW_TREE=$(mktemp -t $(basename $0))

	<system.diagnostics>
	<sources>
	<source name="System.ServiceModel"
	switchValue="Critical,Information,ActivityTracing"
	propagateActivity="true">
	<listeners>
	<add name="messages"
	type="System.Diagnostics.XmlWriterTraceListener"
	initializeData="c:\inetpub\logs\messages.svclog" />
	</listeners>