Emad Aghajani emadpres

Example Git Branching Diagram

You can use this diagram as a template to create your own git branching diagrams. Here's how:

Create a new diagram with diagrams.net (formerly draw.io)
Go to File > Open From > URL
Insert this url (it points to the xml data below): https://gist.githubusercontent.com/bryanbraun/8c93e154a93a08794291df1fcdce6918/raw/bf563eb36c3623bb9e7e1faae349c5da802f9fed/template-data.xml
Customize as needed for your team.

Move your stashes from one repo to another

This was useful for me when we created a new branch for a new major release, but were still working on our current version as well. I cloned our repo again and kept the new project on our new branch, but also wanted to get my stashes there.

Download your stashes

git stash show -p > patch

You'll have to specify your stash and name your file whatevery you want. Do this for as all your stashes, and you'll have patch files in your pwd.

	/***************************************************************************************************
	* Copyright (c) 2016 Rüdiger Herrmann
	* All rights reserved. This program and the accompanying materials are made available under the
	* terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at
	* http://www.eclipse.org/legal/epl-v10.html
	*
	* Contributors:
	* Rüdiger Herrmann - initial API and implementation
	**************************************************************************************************/
	package com.codeaffine.jgit.example;