---
Documentation/user-manual.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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
Signed-off-by: Gustaf Hendeby <redacted>
---
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(-)
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
On Mon, Dec 31, 2007 at 02:31:35PM +0100, Gustaf Hendeby wrote:
Signed-off-by: Gustaf Hendeby <redacted>
---
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 [off-list ref]
Date: Mon Dec 31 14:31:35 2007 +0100
Documentation/user-manual.txt: fix typo
Signed-off-by: Gustaf Hendeby [off-list ref]
Signed-off-by: J. Bruce Fields [off-list ref]
commit f18b1c55e5b7478524c15685cd643555fc919f3f
Author: J. Bruce Fields [off-list ref]
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 [off-list ref]