Signed-off-by: Gustaf Hendeby <hendeby@xxxxxxxxxx> --- 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
