Add only non-whitespace changes

by

@Frew solution wasn’t quite what I needed, so this is the alias I made for the exact same problem:

alias.addnw=!sh -c 'git diff -U0 -w --no-color "$@" | git apply --cached --ignore-whitespace --unidiff-zero -'

Or you can simply run:

git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -

Update

Added options -U0, and --unidiff-zero respectively to workaround context matching issues, according to this comment.

Basically it applies the patch which would be applied with add without whitespace changes. You will notice that after a git addnw your/file there will still be unstaged changes, it’s the whitespaces left.

The –no-color isn’t required but as I have colors set to always, I have to use it. Anyway, better safe than sorry.

Warning

While this trick works as-is, if you try to use it to drop blank line changes with --ignore-blank-lines then things get complicated. With this option, git diff will just drop some chunks, making the resulting patch bogus since the line numbers in the destination file are going to be off.

More Related Contents:

  1. Make Git automatically remove trailing white space before committing
  2. Coloring white space in git-diff’s output
  3. Merging without whitespace conflicts
  4. git whitespace woes
  5. How do I fix “remote: fatal error in commit_refs” errors trying to push with Git?
  6. How can I rename a git stash?
  7. GitHub Clone with OAuth Access Token
  8. Git Clone – Repository not found
  9. How does git log –since count?
  10. Using IntelliJ to amend git commit message
  11. How can I move all git content one-level up in the folder hierarchy?
  12. How do I make git merge’s default be –no-ff –no-commit?
  13. Aborting commit due to empty commit message
  14. How to find the N largest files in a git repository?
  15. What’s the difference between git stash save and git stash push?
  16. Where does Git store files?
  17. Git: How to make outer repository and embedded repository work as common/standalone repository?
  18. Telling if a Git commit is a Merge/Revert commit
  19. Git push error: RPC failed; result=56, HTTP code = 200 fatal: The remote end hung up unexpectedly fatal
  20. GitHub pages only showing ReadMe file?
  21. How to find last git commit before a merge
  22. Why do excluded files keep reappearing in my git sparse checkout?
  23. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?
  24. How to push different local Git branches to Heroku/master
  25. SSH Agent Forwarding with Ansible
  26. Why do changing adjacent lines but modifying independently cause a git merge conflict?
  27. git – remote add origin vs remote set-url origin
  28. Git create branch from range of previous commits?
  29. when you have secret key in your project, how can pushing to GitHub be possible?
  30. Other consequences of `git push –force`?

Leave a Comment