Skip to content

Instantly share code, notes, and snippets.

@knowlet

knowlet/git-subtree-merge-tool.sh

Created September 14, 2015 15:28
Show Gist options
  • Save knowlet/aa5d8624e13579d6afd0 to your computer and use it in GitHub Desktop.
Save knowlet/aa5d8624e13579d6afd0 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-subtree-merge-tool.sh
#!/bin/bash
USER=knowlet
git remote add -f $1 https://github.com/$USER/$1.git
git merge -s ours --no-commit $1/master
git read-tree --prefix=$1/ -u $1/master
git commit -m "Subtree merged in $1"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment