h4tr3d

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

On master:

> git co -b temp

h4tr3d

#include <cstdlib>
#include <cstdio>
#include <iostream>
#include <vector>
#include <cstring>

#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>

h4tr3d

/*
 *  V4L2 video capture example
 *
 *  This program can be used and distributed without restrictions.
 *
 *      This program is provided with the V4L2 API
 * see http://linuxtv.org/docs.php for more information
 *
 * To build:
 *   g++ -std=c++11 -o v4l2-capture v4l2-capture.cpp

h4tr3d

// Test.cpp : Defines the entry point for the console application.
//

#include "stdafx.h"
#include <iostream>     // std::cout
#include <algorithm>    // std::random_shuffle
#include <vector>       // std::vector
#include <ctime>        // std::time
#include <cstdlib>      // std::rand, std::srand

h4tr3d

--- openocd-0.8.0/src/rtos/ThreadX.c	2014-03-30 14:54:34.000000000 +1100
+++ openocd-0.8.0.new/src/rtos/ThreadX.c	2015-02-05 21:01:35.524321020 +1000
@@ -31,12 +31,17 @@
 #include "helper/types.h"
 #include "rtos_standard_stackings.h"
 
+static const struct rtos_register_stacking* get_stacking_info(struct rtos *rtos, int64_t stack_ptr);
+static const struct rtos_register_stacking* get_stacking_info_arm926ejs(struct rtos *rtos, int64_t stack_ptr);
+
 static int ThreadX_detect_rtos(struct target *target);

h4tr3d

#!/bin/bash

ver=20131124
url=http://www.tldp.org/manpages/man-html
fn="man-html-$ver.tar.bz2"

indir="man-html-$ver"
tocname="unixman.qhp"