magnusottosson/gist:3a11d0599a373fc81758551efde39b0f

Created May 20, 2016 14:23

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

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

Download ZIP

Git merge and ignore tabs, spaces and line endings

Raw

gistfile1.txt

git merge -s recursive -Xignore-space-at-eol <branchname>

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