[StGit PATCH 2/4] Tutorial: Explain diffs a little bit better
- From
Karl Hasselström <kha@treskal.com>
- Date
- Oct 12, 2008, 15:11 UTC
- Message-ID
- <20081012151139.17648.28282.stgit@yoghurt>
- In-Reply-To
- <20081012150825.17648.3315.stgit@yoghurt>
Say that we use unified diffs, and point to the Wikipedia article about them. We should probably explain this in more detail ourselves when we get a proper user guide; but for the tutorial, this is probably enough.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
Documentation/tutorial.txt | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 103f3e4..e9d8b22 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -103,10 +103,11 @@ And voilà -- the patch is no longer empty: _main() finally: -(I'm assuming you're already familiar with patches like this from Git, -but it's really quite simple; in this example, I've added the +$$print -'My first patch!'$$+ line to the file +stgit/main.py+, at around line -171.) +(I'm assuming you're already familiar with +htmllink:http://en.wikipedia.org/wiki/Diff#Unified_format[unified +diff] patches like this from Git, but it's really quite simple; in +this example, I've added the +$$print 'My first patch!'$$+ line to the +file +stgit/main.py+, at around line 171.) Since the patch is also a regular Git commit, you can also look at it with regular Git tools such as manlink:gitk[].