From 97e6256f4d611b7edbfa12d3c03cf9b6cca9e3c1 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Thu, 16 Sep 2010 00:53:24 -0600
Subject: Add support for an automatic merge list to gitsync, properly escape
 user-supplied parameters, and improve error handling a bit.

---
 root/.gitsync_merge.sample | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 root/.gitsync_merge.sample

(limited to 'root')

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
-- 
cgit v1.1