Patch to tutorial.txt

Subsystems: documentation, the rest

2 messages, 2 authors, 2016-08-11 · open the first message on its own page

Patch to tutorial.txt

From: Paolo Ciarrocchi <hidden>
Date: 2016-08-11 19:43:38

Hi all,
I'm reading the tutorial and trying to improve it while studying git.

First attempt here:
From 0b98769dfe16e3ba8cde698b75cb1067658c38e7 Mon Sep 17 00:00:00 2001
From: Paolo Ciarrocchi <redacted>
Date: Sun, 19 Nov 2006 23:41:31 +0100
Subject: [PATCH] One of the comment was not really clear, rephrased to
make it easier to be understood by the reader


Signed-off-by: Paolo Ciarrocchi <redacted>
---
 Documentation/tutorial.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 554ee0a..6edfb5a 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -141,7 +141,7 @@ $ git commit -a
 ------------------------------------------------

 at this point the two branches have diverged, with different changes
-made in each.  To merge the changes made in the two branches, run
+made in each.  To merge the changes made in experimental into master run

 ------------------------------------------------
 $ git pull . experimental
-- 
1.4.4.ge3d4


Regards,
-- 
Paolo
http://docs.google.com/View?docid=dhbdhs7d_4hsxqc8
http://www.linkedin.com/pub/0/132/9a3
Non credo nelle otto del mattino. Però esistono. Le otto del mattino
sono l'incontrovertibile prova della presenza del male nel mondo.

Re: Patch to tutorial.txt

From: Jakub Narebski <hidden>
Date: 2016-08-11 20:20:58

Paolo Ciarrocchi wrote:
From 0b98769dfe16e3ba8cde698b75cb1067658c38e7 Mon Sep 17 00:00:00 2001
I think you should remove this line.
From: Paolo Ciarrocchi <redacted>
Date: Sun, 19 Nov 2006 23:41:31 +0100
Subject: [PATCH] One of the comment was not really clear, rephrased to
make it easier to be understood by the reader
Wordwrap. Perhaps it would be better to split description into short line,
and two-line description.

[...]
 ------------------------------------------------

 at this point the two branches have diverged, with different changes
-made in each.  To merge the changes made in the two branches, run
+made in each.  To merge the changes made in experimental into master run
I would rather say:
  To merge the changes made in the two branches into master, run

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help