diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-09-16 00:53:24 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-09-16 02:40:17 -0600 |
| commit | 97e6256f4d611b7edbfa12d3c03cf9b6cca9e3c1 (patch) | |
| tree | 0b69d0c2d3c192774834985793248712fd260efa /root | |
| parent | 9bc8788aa9eb28c39ce204a51a341b3d5586f3d7 (diff) | |
| download | pfsense-97e6256f4d611b7edbfa12d3c03cf9b6cca9e3c1.zip pfsense-97e6256f4d611b7edbfa12d3c03cf9b6cca9e3c1.tar.gz | |
Add support for an automatic merge list to gitsync, properly escape user-supplied parameters, and improve error handling a bit.
Diffstat (limited to 'root')
| -rw-r--r-- | root/.gitsync_merge.sample | 3 |
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 |
