From 61dcbb456d42fefc8aaac456e02c40bdef7de774 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 21 Jul 2018 16:00:05 +1000 Subject: [PATCH] updating doc --- test/generate_basic_repo.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/generate_basic_repo.sh b/test/generate_basic_repo.sh index e7f567a23..385ea8520 100755 --- a/test/generate_basic_repo.sh +++ b/test/generate_basic_repo.sh @@ -3,6 +3,9 @@ # this script will make a repo with a master and develop branch, where we end up # on the master branch and if we try and merge master we get a merge conflict +# call this command from the test directory: +# ./generate_basic_repo.sh; cd testrepo; gg; cd .. + # -e means exit if something fails # -x means print out simple commands before running them set -ex