Permalink
Browse files

Updated discount-config README

  • Loading branch information...
1 parent 02daa56 commit efcd0f800f958ffa6fd5a85a227cfb251ed90228 @mugginsoft mugginsoft committed Jan 25, 2012
Showing with 29 additions and 0 deletions.
  1. +5 −0 discount-config/README.markdown
  2. +24 −0 discount-config/README.markdown.orig
@@ -9,6 +9,11 @@ Discount is included as a [fake submodule][]. To upgrade or test other versions
rm -rf discount/
git clone git://github.com/Orc/discount.git discount
+<<<<<<< HEAD
+=======
+The discount folder will contain a .git folder following the clone however this folder is not included in the enclosing repository and will not be propagated by a push or clone.
+
+>>>>>>> 0f7eb8d... Updated discount-config README
## Config files ##
When discount is changed, regenerate the config files. The included `update.sh` script should do this automatically.
@@ -0,0 +1,24 @@
+# [Discount][] instructions #
+
+This folder holds the files generated by discount's `configure.sh` script that are used by MarkdownLive and QLMarkdown.
+
+## Upgrading discount ##
+
+Discount is included as a [fake submodule][]. To upgrade or test other versions of discount, delete the files in the `discount` directory and clone a new local repository into it:
+
+ rm -rf discount/
+ git clone git://github.com/Orc/discount.git discount
+
+<<<<<<< HEAD
+=======
+The discount folder will contain a .git folder following the clone however this folder is not included in the enclosing repository and will not be propagated by a push or clone.
+
+>>>>>>> 0f7eb8d... Updated discount-config README
+## Config files ##
+
+When discount is changed, regenerate the config files. The included `update.sh` script should do this automatically.
+
+If you want to update the files by hand, remove the "configuration for markdown, generated" comments at the head of `config.h` to avoid adding needless patches to the git history.
+
+[discount]:https://github.com/Orc/discount
+[fake submodule]:http://debuggable.com/posts/git-fake-submodules:4b563ee4-f3cc-4061-967e-0e48cbdd56cb

0 comments on commit efcd0f8

Please sign in to comment.