How does git compare files?

Question

I'm using git with my latex files. I had few conflicts and because paragraphs are long, it's difficult to find what's the difference, so I'm curious how git compares files? Is there a way to turn on comparison char by char, if exists? For latex it would be great :) I don't like to write each sentence in new line, which is possible in latex and doesn't break the whole paragraph, but it's ugly.

When we have:

It's realy simple sentenec

and when Person#1 change it to:

It's a really simple sentenec

and simultaneously Person#2 change it to:

It's a really simple sentence.

There is a conflict and it should be resolved, because these changes are, or could be disjoint. Right?

stackoverflow.com/questions/5587626/git-merging-within-a-line unix.stackexchange.com/questions/20021/… — Josh Lee
– Josh Lee, Commented Oct 17, 2012 at 20:39

Simon Boudrias · Accepted Answer · 2012-10-17 20:38:04Z

1

Git compare line by line.

If you want to compare char by char, you can do this command:

git diff --word-diff-regex=.

answered Oct 17, 2012 at 20:38

Simon Boudrias

44.9k16 gold badges109 silver badges137 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

How does git compare files?

1 Answer 1

Comments

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Linked

Related