git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[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[].
Previous: Karl HasselströmNext: Karl Hasselström
Message 3 of 6 in “More tutorial updates”
  1. 0/4 More tutorial updatesKarl Hasselström, Oct 12, 2008
  2. 1/4 Tutorial: Talk about conflicts when introducing StGitKarl Hasselström, Oct 12, 2008
  3. 2/4 Tutorial: Explain diffs a little bit betterKarl Hasselström, Oct 12, 2008
  4. 3/4 Tutorial: Cover "stg mail"Karl Hasselström, Oct 12, 2008
  5. 4/4 Tutorial: Write about rebasingKarl Hasselström, Oct 12, 2008
  6. Catalin MarinasOct 12, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.