+ [2015-02-02T00:47:56Z] jaybe fehwalker, octopress 2 and octopress 3 are *completely* different things. 100%.
+ [2015-02-05T04:59:55Z] compadre I had a question about updating octopress, I'm fairly new to Git and was wondering if I'm going about arranging everything in the ideal way.
+ [2015-02-05T05:01:38Z] compadre the way it stands now I execute git pull origin master in the root directory rather than git pull octopress master
+ [2015-02-05T05:04:06Z] compadre I think I gathered that the origin master is different than my own master, when I push it goes to my master, but when I pull I specifically specific git pull origin master and I believe it's update but am unsure.

message no. 77766

Posted by compadre in #octopress at 2015-02-05T05:01:38Z

the way it stands now I execute git pull origin master in the root directory rather than git pull octopress master
+ [2015-02-09T19:52:58Z] xcyclist I am looking through all the tutorials, and there doesn't seem to be a recommended specific on where to actually put your content files for the blog, nor what to call them. There is a config header, but ...sorry if I am wanting more specifics than is normal...
+ [2015-02-09T19:55:34Z] xcyclist Sorry. I think I got it.
+ [2015-02-09T19:57:03Z] jaybe jekyllrb.com
+ [2015-02-09T19:57:44Z] xcyclist Nope. I still don't get it. I generated a file with configs between two lines that have --- on them only. I may be dumb, but it isn't markdown is it? Does my markdown go below the last ---, or in a separate file?
+ [2015-02-09T19:58:46Z] jaybe that link i just provided has full documentation