From 27373fe0e6a512591206d0de866157cb5865c04e Mon Sep 17 00:00:00 2001 Message-Id: <27373fe0e6a512591206d0de866157cb5865c04e.1719180144.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 25 Sep 2005 09:16:17 +0100 Subject: [PATCH] Minor typos in the tutorial Organization: Straylight/Edgeware From: Catalin Marinas Signed-off-by: Catalin Marinas --- doc/tutorial.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/tutorial.txt b/doc/tutorial.txt index 32a3298..85d0304 100644 --- a/doc/tutorial.txt +++ b/doc/tutorial.txt @@ -179,7 +179,10 @@ the examples/ directory. Most users would probably only define the The gitmergeonefile.py script does the three-way merging on individual files using the tool specified by the 'merger' option. The user can -specify a smarter tool to be used. Templates +specify a smarter tool to be used. + +Templates +--------- The 'export' and 'mail' commands use templates for generating the patch files or e-mails. The default templates are installed under @@ -195,7 +198,10 @@ file can be used as an example. A default description for new patches can be defined in the .git/patchdescr.tmpl file. This is useful for things like -signed-off-by lines. Dealing with conflicts +signed-off-by lines. + +Dealing with conflicts +---------------------- Pushing a patch on the stack can fail if the patch cannot be applied cleanly. This usually happens if there are overlapping changes in the -- [mdw]