From 8c864c8d194d3b133a283adaaa7adec6ef105f44 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Sun, 4 Oct 2015 05:53:25 -0700 Subject: [PATCH] README_FIRST.txt: update for TopGit 0.17 And remove the bit about a fast-forward because it won't be. Signed-off-by: Kyle J. McKay --- README_FIRST.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README_FIRST.txt b/README_FIRST.txt index 723bb73244..722cd6449a 100644 --- a/README_FIRST.txt +++ b/README_FIRST.txt @@ -10,7 +10,7 @@ TopGit is available from: -TopGit version 0.16 or later is highly recommended. +TopGit version 0.17 or later is highly recommended. Once TopGit is installed, the following will set up a local clone of the girocco gitweb repository for use @@ -44,18 +44,18 @@ the following procedure would be used: tg update girocco When `tg update girocco` runs it will first merge -refs/top-bases/release into refs/heads/release (which should -be a fast-forward update) and then it will proceed to merge -those updates throughout the network of topics that girocco -depends on culminating in an update to the girocco topic -itself. Along the way any conflicts will need to be resolved. +refs/top-bases/release into refs/heads/release and then it +will proceed to merge those updates throughout the network of +topics that girocco depends on culminating in an update to +the girocco topic itself. Along the way any conflicts will +need to be resolved. The `tg update girocco` process may take some time to run. To see the list of topics that the girocco branch depends on and their relationships to one another run this command: - tg summary --rdeps girocco | grep -v release + tg summary --rdeps --exclude=release girocco (Since all of the topics ultimately depend on release, omitting those lines makes for a more useful display.) -- 2.11.4.GIT