[or-cvs] [githax/master] Add further reading links to Thandy howto

[nickm@xxxxxxxx (Nick Mathewson)]

Author: Marcus Griep <marcus@xxxxxxxx>
Date: Fri, 24 Apr 2009 21:26:26 -0600
Subject: Add further reading links to Thandy howto
Commit: 5074fb72c5b764575b70215ba1e9136247f54a4b

Links on rebasing and merging and a link to the Git tutorial

Signed-off-by: Marcus Griep <marcus@xxxxxxxx>
---
 doc/Howto-thandy.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/doc/Howto-thandy.txt b/doc/Howto-thandy.txt
index 7ccbca4..98ee4ee 100644
--- a/doc/Howto-thandy.txt
+++ b/doc/Howto-thandy.txt
@@ -368,3 +368,10 @@ To see how the git folks do it:
 
 http://www.kernel.org/pub/software/scm/git/docs/howto/maintain-git.txt
 
+For a better understanding of how merging and rebasing work:
+
+http://www.kernel.org/pub/software/scm/git/docs/git-merge.html
+http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html
+
+And the Git tutorial which is also a good guide to get started:
+http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
-- 
1.5.6.5