Merge branch 'jk/ci-only-on-selected-branches'

gitster · gitster · commit 24109910fe99 · 2020-05-29T15:12:19.000-07:00
Dev support.

* jk/ci-only-on-selected-branches:
  ci/config: correct instruction for CI preferences
diff --git a/ci/config/allow-ref.sample b/ci/config/allow-ref.sample
@@ -7,8 +7,9 @@
 # your repository:
 #
 #   git checkout -b ci-config
-#   cp allow-refs.sample allow-refs
-#   $EDITOR allow-refs
+#   cp allow-ref.sample allow-ref
+#   $EDITOR allow-ref
+#   git add allow-ref
 #   git commit -am "implement my ci preferences"
 #   git push
 #

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,9 @@`
`7`	`7`	`# your repository:`
`8`	`8`	`#`
`9`	`9`	`# git checkout -b ci-config`
`10`		`-# cp allow-refs.sample allow-refs`
`11`		`-# $EDITOR allow-refs`
	`10`	`+# cp allow-ref.sample allow-ref`
	`11`	`+# $EDITOR allow-ref`
	`12`	`+# git add allow-ref`
`12`	`13`	`# git commit -am "implement my ci preferences"`
`13`	`14`	`# git push`
`14`	`15`	`#`