Gitignore notes and word-based diffing #392
Conversation
_episodes/04-changes.md
Outdated
| @@ -474,6 +474,13 @@ Date: Thu Aug 22 09:51:46 2013 -0400 | |||
| ~~~ | |||
| {: .output} | |||
|
|
|||
| > ## Word-based diffing | |||
| > | |||
| > Sometimes, e.g. in the case of the LaTeX documment a line-wise | |||
_episodes/04-changes.md
Outdated
| @@ -474,6 +474,13 @@ Date: Thu Aug 22 09:51:46 2013 -0400 | |||
| ~~~ | |||
| {: .output} | |||
|
|
|||
| > ## Word-based diffing | |||
| > | |||
| > Sometimes, e.g. in the case of the LaTeX documment a line-wise | |||
There was a problem hiding this comment.
There is a missing comma after "document":
"Sometimes, e.g. in the case of a LaTeX document, ..."
but I think it may even better not to mention the LaTeX example: most of our learners do not use it and this may make them think that the color diff is not useful for them.
_episodes/04-changes.md
Outdated
| > ## Word-based diffing | ||
| > | ||
| > Sometimes, e.g. in the case of the LaTeX documment a line-wise | ||
| > diff is too coarse. That is where the `--color-words` option of |
There was a problem hiding this comment.
I would rephrase it to explain a bit what color-words does. From the docs: "Highlights the changed words using colors". What do you think of changing your sentence "That is where ... " to include something similar?
_episodes/02-setup.md
Outdated
| @@ -98,6 +98,8 @@ same commands to choose another editor or update your email address. | |||
| > $ git config --global --unset https.proxy | |||
| > ~~~ | |||
| > {: .bash} | |||
| > In addition git supports the SSH protocol, which needs no proxy configuration, and | |||
There was a problem hiding this comment.
I'd prefer not to include this change. I think it's useful information for a more advanced crowd, but it may be confussing for a novice. The only reason the proxy callout is here is because it may be needed in some workshops with a weird network configuration.
_episodes/07-github.md
Outdated
| @@ -144,6 +144,7 @@ Branch master set up to track remote branch master from origin. | |||
| > $ git config --global --unset https.proxy | |||
| > ~~~ | |||
| > {: .bash} | |||
| > Please remember that for using SSH as connection, proxy setup is not needed. | |||
There was a problem hiding this comment.
Something as above. I think mentioning details of SSH won't be useful and may be confussing for most of our learners. We have a few links to set up properly SSH in this episode and I think this is enough.
junghans
changed the title
|
@iglpdc: Done! |
|
Thanks a lot @junghans ! |
Add gitignore notes and word-based diffing
git://and ssh proxy**pattern in gitignore section--color-wordsoption in diff section, which is extremely useful for LaTeX files.