Permalink
Browse files

Add more instructions

  • Loading branch information...
1 parent 1665c44 commit 4d7bc4cb6ee27784c157c2e063596a36bb5b6340 @efonne committed Apr 19, 2012
Showing with 7 additions and 1 deletion.
  1. +7 −1 README.md
View
@@ -1,4 +1,10 @@
# Information about branches
## Hyper-V_patches
-Merge this when doing a gitsync to pull in some workarounds to make the Hyper-V/VirtualServer/VirtualPC emulated network interfaces function. It is designed to be mergeable into 2.0.x or current.
+Merge this when doing a gitsync to pull in some workarounds to make the Hyper-V/VirtualServer/VirtualPC emulated network interfaces function. It is designed to be mergeable into 2.0.x or current.
+
+To merge automatically every time you use gitsync, create /root/.gitsync_merge if it does not exist and add this line to it:
+
+`git://github.com/efonne/pfsense.git Hyper-V_patches`
+
+Specify build_commit as the branch for gitsync if you only want to install the patch and do not want to update any other web GUI code. Note that this gitsync should be performed before installing any packages that modify the web GUI code. You may also go to System: Firmware: Updater Settings, enable gitsync on update, and add the special build_commit branch name if you want the patch to be applied any time you install a firmware update.

0 comments on commit 4d7bc4c

Please sign in to comment.