RE: git merge (again) (was Re: [csmith-project/csmith] 0229d0: ...)

[Eric Eide <eeide@cs.utah.edu>]

	Xuejun> Eric, I know you are going raise the eyebrow. I did try
	Xuejun> "rebase", and git wouldn't allow me. Here is the error message:

	>> git rebase master fixes
	Xuejun> cannot rebase: you have unstaged changes
	Xuejun> M       autoconf/compile
	Xuejun> [...]
	Xuejun> And I am totally confused. I didn't touch these files at all.

Almost certainly, this is due to some sort of EOL conversion.

This is a confusing part of git.  (At least, I find it more confusing than the
other parts.)

Assuming that you want to discard these changes, do this:

  git reset --hard HEAD

And then try this on your Windows box:

  git config --global core.eol lf

But I should spend a little more time figuring out how we should do this.

Eric.

-- 
-------------------------------------------------------------------------------
Eric Eide <eeide@cs.utah.edu>  .         University of Utah School of Computing
http://www.cs.utah.edu/~eeide/ . +1 (801) 585-5512 voice, +1 (801) 581-5843 FAX