threads / patch / 11419

patchuser-manual: fix typo

Subject: [PATCH] user-manual: fix typo

## tl;dr

3 messages between Dec 29, 2007 and Dec 31, 2007. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Gustaf Hendeby· Dec 29, 2007, 09:52 UTC · lore

---
 Documentation/user-manual.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to Documentation/user-manual.txt +1 −1

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f2b4206..3f552e9 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -74,7 +74,7 @@ version is called a <<def_commit,commit>>.
 
 Those snapshots aren't necessarily all arranged in a single line from
 oldest to newest; instead, work may simultaneously proceed along
-parallel lines of development, called <def_branch,branches>>, which may
+parallel lines of development, called <<def_branch,branches>>, which may
 merge and diverge.
 
 A single git repository can track development on multiple branches.  It

-- 
1.5.4.rc2.1.g4bcdb

Gustaf Hendeby· Dec 31, 2007, 13:31 UTC · re: Gustaf Hendeby · lore

[PATCH] Documentation/user-manual.txt: fix typo

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
---

I didn't see this one in the latest patches added to v1.5.4-rc2 so I guess it was forgotten, or just dropped because it seems I forgot to sign it the last time. (Sorry about that, it should teach me not to do anything important at 4 in the morning...) I think the patch is obviously correct so I'm resending.

/Gustaf

 Documentation/user-manual.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to Documentation/user-manual.txt +1 −1

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f2b4206..3f552e9 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -74,7 +74,7 @@ version is called a <<def_commit,commit>>.
 
 Those snapshots aren't necessarily all arranged in a single line from
 oldest to newest; instead, work may simultaneously proceed along
-parallel lines of development, called <def_branch,branches>>, which may
+parallel lines of development, called <<def_branch,branches>>, which may
 merge and diverge.
 
 A single git repository can track development on multiple branches.  It

-- 
1.5.4.rc2.8.g41c7c6

J. Bruce Fields· Dec 31, 2007, 16:28 UTC · re: Gustaf Hendeby · lore

Re: [PATCH] Documentation/user-manual.txt: fix typo

On Mon, Dec 31, 2007 at 02:31:35PM +0100, Gustaf Hendeby wrote:

Show 8 quoted lines

> Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
> ---
> 
> I didn't see this one in the latest patches added to v1.5.4-rc2 so I
> guess it was forgotten, or just dropped because it seems I forgot to
> sign it the last time.  (Sorry about that, it should teach me not to
> do anything important at 4 in the morning...)  I think the patch is
> obviously correct so I'm resending.

Yep, thanks!  Applied and pushed out to

	git://linux-nfs.org/~bfields/git.git maint

--b.

commit 57283291b55cdc4ab726231073450d185beb361a
Author: Gustaf Hendeby <hendeby@isy.liu.se>
Date:   Mon Dec 31 14:31:35 2007 +0100

    Documentation/user-manual.txt: fix typo
    
    Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

commit f18b1c55e5b7478524c15685cd643555fc919f3f
Author: J. Bruce Fields <bfields@citi.umich.edu>
Date:   Fri Dec 21 19:57:16 2007 -0500

    Documentation: fix remote.<name>.skipDefaultUpdate description
    
    Fix the subcommand name.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>