summaryrefslogtreecommitdiffstats
path: root/root
diff options
context:
space:
mode:
Diffstat (limited to 'root')
-rw-r--r--root/.gitsync_merge.sample3
1 files changed, 3 insertions, 0 deletions
diff --git a/root/.gitsync_merge.sample b/root/.gitsync_merge.sample
new file mode 100644
index 0000000..1c2606c
--- /dev/null
+++ b/root/.gitsync_merge.sample
@@ -0,0 +1,3 @@
+# Sample automatic merge list for gitsync
+# gitsync will automatically merge anything listed in /root/.gitsync_merge
+http://repositorysite/my_repository.git my_branch
OpenPOWER on IntegriCloud