Read more

Git: Ignore whitespace when merging or cherry-picking

Tobias Kraze
January 08, 2016Software engineer at makandra GmbH
Say thanks1

You can tell git to ignore different kinds and amounts of whitespace when merging or cherry-picking. This often occurs when you changed indentation, or converted tabs to spaces.

Illustration web development

Do you need DevOps-experts?

Your development team has a full backlog? No time for infrastructure architecture? Our DevOps team is ready to support you!

  • We build reliable cloud solutions with Infrastructure as code
  • We are experts in security, Linux and databases
  • We support your dev team to perform
Read more Show archive.org snapshot

Simply use

git merge <REV> -Xignore-space-change

or

git cherry-pick <REV> -Xignore-space-change
License for source code
Posted by Tobias Kraze to makandra dev (2016-01-08 17:31)
This website uses short-lived cookies to improve usability.
or learn more