diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-25 08:08:24 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-25 14:49:54 -0300 |
| commit | 46bc6e545a17e77202aaf01ec0cd8d5a46567525 (patch) | |
| tree | 32d18dda436ec739c67c489ceb771e8629cd926f /src/root/.gitsync_merge.sample | |
| parent | 4d9801c2dbd2b3e54a39578ee62b93af66607227 (diff) | |
| download | pfsense-46bc6e545a17e77202aaf01ec0cd8d5a46567525.zip pfsense-46bc6e545a17e77202aaf01ec0cd8d5a46567525.tar.gz | |
Move main pfSense content to src/
Diffstat (limited to 'src/root/.gitsync_merge.sample')
| -rw-r--r-- | src/root/.gitsync_merge.sample | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/root/.gitsync_merge.sample b/src/root/.gitsync_merge.sample new file mode 100644 index 0000000..1c2606c --- /dev/null +++ b/src/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 |
