[git-users] Re: showing more number of insertions deletions than actual
I cannot share the files as it is confidential Yes I am using git on windows.I have set core.autocrlf=true in global list and config settings. Please help me with this. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Re: showing more number of insertions deletions than actual
On 14 April 2015 at 13:20, rajiv gupta rajiv.s...@gmail.com wrote: How can i correct the three files so that they show actual insertions and deletions? Read up on line ending issues in git and adjust your configuration. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Re: showing more number of insertions deletions than actual
On 14 April 2015 at 13:14, rajiv gupta rajiv.s...@gmail.com wrote: The issue is with ^M character.how should i correct it? If you consult a search engine you'll find that ^M is a (common) way to show 0x0d, i.e. the carriage return character. That's a long way to say that you almost certainly do have issues with line endings. I simply remove ^M characters, but only after verifying that Unix line endings is the correct thing to have in my repo! /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Re: showing more number of insertions deletions than actual
On 14 April 2015 at 12:43, rajiv gupta rajiv.s...@gmail.com wrote: I cannot share the files as it is confidential Yes I am using git on windows.I have set core.autocrlf=true in global list and config settings. Please help me with this. If it indeed *is* line ending issues there's not much to do about it except the obvious. Just ensure all developers have sane settings on all tools (git, editors, etc), so you avoid bouncing back and forth between line endings. Then convert all files to the correct line endings and make a single massive commit. If you've done it all correctly you won't run into any more line ending issues in the future (or at least until you bring in a new developer who forgets to configure git properly ;). /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Re: showing more number of insertions deletions than actual
How can i correct the three files so that they show actual insertions and deletions? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Re: showing more number of insertions deletions than actual
On Tue, 14 Apr 2015 03:43:12 -0700 (PDT) rajiv gupta rajiv.s...@gmail.com wrote: I cannot share the files as it is confidential Yes I am using git on windows.I have set core.autocrlf=true in global list and config settings. That's most probably the culprit. Make sure this setting is set to false on all levels where it's being used and then re-clone the repo. (It's possible to fix up without recloning but this, I reckon, will drag us too far away...) -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
