If it makes any difference, here's my git version, and my current config: tchalvak:~/ninjawars$ git --version git version 1.6.0.4
tchalvak:~/ninjawars$ git config --list color.branch=auto color.diff=auto color.status=auto color.branch.current=yellow reverse color.branch.local=yellow color.branch.remote=green color.diff.meta=yellow bold color.diff.frag=magenta bold color.diff.old=red bold color.diff.new=green bold color.status.added=yellow color.status.changed=green color.status.untracked=cyan gui.recentrepo=/home/tchalvak/zd/htdocs/cms apply.whitespace=strip user.name=**** user.email=**** alias.co=checkout github.user=tchalvak github.token=**** core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true [email protected]:tchalvak/ninjawars.git remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* branch.master.remote=origin branch.master.merge=refs/heads/master On Aug 16, 10:05 pm, Tchalvak <[email protected]> wrote: > Whitespace, it turns out, has ended up being a horrible pain for me > while using git. > > git config apply.whitespace=strip > seems to highten your chances of getting conflicts (as you strip > unneeded whitespace and then other collaborators see the stripped > whitespace as a change to their commits?) > > I think that I've tried a few other configurations for that in the > past, and maybe one of the other configs solves this, or maybe there's > other settings to deal with whitespace that I just haven't come > across, but I haven't yet found a clear way to get where I want to be. > > Where I want to be: > I never want to have another conflict on whitespace. If another > committer alters whitespace, or I alter whitespace and then have to > merge against my own conflicts, i really don't want to know about it. > If someone changes my code from K&R style to One True Brace style by > changing whitespace, I'd prefer git paying no attention over having to > see conflicts about it. > > So... ...is there any way that I can configure git to do that? --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/github?hl=en -~----------~----~----~----~------~----~------~--~---
