* [PATCH] Doc: Make comment about merging in tutorial.txt more clear
@ 2006-11-20 20:29 Paolo Ciarrocchi
0 siblings, 0 replies; only message in thread
From: Paolo Ciarrocchi @ 2006-11-20 20:29 UTC (permalink / raw)
To: Git Mailing List
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
Rephrased a sentence in order to make more clear the concept of
pull . branch
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
---
Documentation/tutorial.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 554ee0a..646395d 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 did in experimental into master, run
------------------------------------------------
$ git pull . experimental
--
1.4.4.ge3d4
--
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.
Gli ultimi giorni, Andrew Masterson
[-- Attachment #2: 0001-Doc-Make-comment-about-merging-in-tutorial.txt-more-clear.txt --]
[-- Type: text/plain, Size: 955 bytes --]
From 1a4e078515547c346b5d6e8b74abcd24b20acb78 Mon Sep 17 00:00:00 2001
From: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Date: Mon, 20 Nov 2006 21:25:47 +0100
Rephrased a sentence in order to make more clear the concept of
pull . branch
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
---
Documentation/tutorial.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 554ee0a..646395d 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 did in experimental into master, run
------------------------------------------------
$ git pull . experimental
--
1.4.4.ge3d4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-11-20 20:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-20 20:29 [PATCH] Doc: Make comment about merging in tutorial.txt more clear Paolo Ciarrocchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).