nmnp/GitMerge.txt

Created April 9, 2015 00:25

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/nmnp/5435566eefb0c4ed9103.js"></script>
Save nmnp/5435566eefb0c4ed9103 to your computer and use it in GitHub Desktop.

Download ZIP

git merge dry run

Raw

GitMerge.txt

git config --global alias.mergetest '!f(){ git merge --no-commit --no-ff "$1"; git merge --abort; echo "Merge aborted"; };f '

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment