From aedc991ffd404884bf8292b9924a174a8b79bd7a Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 7 Mar 2017 16:45:49 -0700 Subject: [PATCH 1/2] added note about ** ignore pattern --- _episodes/06-ignore.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_episodes/06-ignore.md b/_episodes/06-ignore.md index 7e0793fbce..794098faa2 100644 --- a/_episodes/06-ignore.md +++ b/_episodes/06-ignore.md @@ -168,6 +168,9 @@ nothing to commit, working directory clean > > and create an exception for the `results/data/` folder. > > The next challenge will cover this type of solution. > > +> > Sometimes the `**` pattern comes in handy, too, which matches +> > multiple directory levels. E.g. `**/results/plots/*` would make git ignore +> > the `results/plots` directory in any root directory. > {: .solution} {: .challenge} From 79c72abe49c13d06c03dd70a433635adf057d5b4 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 7 Mar 2017 16:45:58 -0700 Subject: [PATCH 2/2] added box aobut word-based diffing --- _episodes/04-changes.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_episodes/04-changes.md b/_episodes/04-changes.md index 9c9721a1a2..b352df8e52 100644 --- a/_episodes/04-changes.md +++ b/_episodes/04-changes.md @@ -474,6 +474,14 @@ Date: Thu Aug 22 09:51:46 2013 -0400 ~~~ {: .output} +> ## Word-based diffing +> +> Sometimes, e.g. in the case of the text documments a line-wise +> diff is too coarse. That is where the `--color-words` option of +> `git diff` comes in very useful as it highlights the changed +> words using colors. +{: .callout} + > ## Paging the Log > > When the output of `git log` is too long to fit in your screen,