There's a map for that

Re:There's a map for that by gcr on Thursday June 13, 2013 @07:39PM (#5877378)

I'm a grad student who writes lots of papers in LaTeX with collaborators. We use git most of the time, but git works most painlessly when you tweak it to ignore whitespace and to use word diffs. For example, let's say that my collaborator says "oh, I pushed a new diff" and now I'm curious what he added. Running:

    git pull && git log -p -w --color-words

lets me see exactly which words he added/removed/changed ignoring the fact that he changed all my tabs to spaces in that commit.

Also, if I have a conflict, it's also nicer to use a specialized tool to merge than relying on git's linewise merges.

I imagine github could incorporate some of these tools too.

[ Parent | on HN ]

Re:There's a map for that by reledi on Friday June 14, 2013 @02:35AM (#5878579)

> I imagine github could incorporate some of these tools too.

GitHub allows you to ignore whitespace in diffs by appending _?w=1_ to the URL [1]. They should make this more obvious with a button in the diff interface.

[1] https://github.com/blog/967-github-secrets

[ Parent | on HN ]

Re:There's a map for that by spikels on Thursday June 13, 2013 @08:27PM (#5877606)

Thanks for the tip. I'm working on a short non-technical book so I'm hoping to do it in Markdown following the format of The Little MongoDb Book. That book is hosted on GitHub with the Markdown text output to PDF, mobi and ePub. Seems like the simplest way to get to a pretty nice looking book in the major formats.

https://github.com/karlseguin/the-little-mongodb-book

[ Parent | on HN ]