Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: Whitespace on commit

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:22

"Kenneth P. Turvey" [off-list ref] writes:
I keep getting annoying errors when I try to commit.  Git complains that I
have whitespace in the wrong places.  

This is fine.. I even like it.  What I don't like is having to change this
stuff manually.  Is there anyway to tell git to just fix the stuff and do
the commit?  

I've tried setting

apply.whitespace = fix 

in my .gitconfig, but that doesn't seem to help when doing commits.
Yeah, that is to protect yourself from whitespace mess _other people_
threw at you in a patch form.

You can ask git to fix your own stuff up, by pretending that you are that
other person who made the mess, by doing:

	git diff HEAD >P.diff
        git reset --hard HEAD
        git apply --index --whitespace=fix P.diff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help