ingydotnet · Feb 7, 2017 · May 21, 2018 · Feb 13, 2019 · May 24, 2019 · Dec 4, 2019
Showing with 8 additions and 25 deletions.

+2 −11 .travis.yml

+2 −6 ReadMe.pod

+0 −4 doc/git-subrepo.swim

+4 −4 doc/intro-to-subrepo.swim
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,9 @@ sudo: false
 # Want 'bash' but 'c' works:
 language: c
 
-branches:
-  only:
-  - master
-  - /^release\//
-
 script:
-- git checkout $(
-    git branch --contains HEAD
-        | cut -c3-
-        | grep -E '^(master$|release)'
-        | head -1
-  )
+# NOTE: we have to make sure we're on a branch (rather than on a detached HEAD) because tests rely on it.
+- git checkout -b travis-ci-dummy-branch-name
 - GIT_COMMITTER_NAME=Bob
   GIT_COMMITTER_EMAIL=bob@blob.net
   GIT_AUTHOR_NAME='Bob Blob'

diff --git a/ReadMe.pod b/ReadMe.pod
@@ -218,10 +218,6 @@ When you pull you can assume a fast-forward strategy (default) or you can
 specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
 same as a C<clone --force> operation, using the current remote and branch.
 
-When you pull you can assume a fast-forward strategy (default) or you can
-specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
-same as a C<clone --force> operation, using the current remote and branch.
-
 Like the C<clone> command, C<pull> will squash all the changes (since the last
 pull or clone) into one commit. This keeps your mainline history nice and
 clean. You can easily see the subrepo's history with the C<git log> command:
@@ -354,8 +350,8 @@ Example to update the C<method> option for a subrepo:
 Same as C<git help subrepo>. Will launch the manpage. For the shorter usage,
 use C<git subrepo -h>.
 
-Use C<< git subrepo help <command> to get help for a specific command. Use >>--
-all` to get a summary of all commands.
+Use C<< git subrepo help <command> >> to get help for a specific command. Use C<--
+all> to get a summary of all commands.
 
 The C<help> command accepts the C<--all> option.
 

diff --git a/doc/git-subrepo.swim b/doc/git-subrepo.swim
@@ -177,10 +177,6 @@ the same arguments. Keep reading…
   specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
   as a `clone --force` operation, using the current remote and branch.
 
-  When you pull you can assume a fast-forward strategy (default) or you can
-  specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
-  as a `clone --force` operation, using the current remote and branch.
-
   Like the `clone` command, `pull` will squash all the changes (since the last
   pull or clone) into one commit. This keeps your mainline history nice and
   clean. You can easily see the subrepo's history with the `git log` command:

diff --git a/doc/intro-to-subrepo.swim b/doc/intro-to-subrepo.swim
@@ -320,10 +320,10 @@ The resulting history is:
 
 Compare that to *subtree*. This:
 
-  $ git subrepo add abc git@github.com:user/abc master
-  $ git subrepo add xyz git@github.com:user/def master
-  $ git subrepo pull abc git@github.com:user/abc master
-  $ git subrepo pull xyz git@github.com:user/def master
+  $ git subtree add abc git@github.com:user/abc master
+  $ git subtree add xyz git@github.com:user/def master
+  $ git subtree pull abc git@github.com:user/abc master
+  $ git subtree pull xyz git@github.com:user/def master
 
 Produces this: