From: Tim Otten <totten@civicrm.org>
Date: Sat, 30 Mar 2013 21:09:02 +0000 (-0400)
Subject: givi - Explain workfow assumptions in help text
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=729ccb4d6dd1efbcd3c43dda8971a1a2187f6d5e;p=civicrm-core.git

givi - Explain workfow assumptions in help text
---

diff --git a/bin/givi b/bin/givi
index 643ad9d9f3..b18d9b1f4b 100755
--- a/bin/givi
+++ b/bin/givi
@@ -192,6 +192,11 @@ class Givi {
   function doHelp() {
     $program = basename($this->program);
     echo "Givi - Coordinate git checkouts across CiviCRM repositories\n";
+    echo "Scenario:\n";
+    echo "  You have cloned and forked the CiviCRM repos. Each of the repos has two\n";
+    echo "  remotes (origin + upstream). When working on a new PR, you generally want\n";
+    echo "  to checkout official code (eg upstream/master) in all repos, but 1-2 repos\n";
+    echo "  should use a custom branch (which tracks upstream/master).\n";
     echo "Usage:\n";
     echo "  $program [options] checkout <branch>\n";
     echo "  $program [options] fetch\n";