Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update the website

  • Loading branch information...
commit e4f1da0d8820b2f61cba4b198d677f2c250149ca 1 parent 4f6fee9
@datawolf authored
Showing with 821 additions and 21 deletions.
  1. 0  .editorconfig
  2. 0  .gitattributes
  3. 0  .gitignore
  4. 0  .powrc
  5. 0  .rbenv-version
  6. 0  .rvmrc
  7. 0  .slugignore
  8. 0  .themes/classic/.editorconfig
  9. 0  .themes/classic/sass/_base.scss
  10. 0  .themes/classic/sass/_partials.scss
  11. 0  .themes/classic/sass/base/_layout.scss
  12. 0  .themes/classic/sass/base/_solarized.scss
  13. 0  .themes/classic/sass/base/_theme.scss
  14. 0  .themes/classic/sass/base/_typography.scss
  15. 0  .themes/classic/sass/base/_utilities.scss
  16. 0  .themes/classic/sass/custom/_colors.scss
  17. 0  .themes/classic/sass/custom/_fonts.scss
  18. 0  .themes/classic/sass/custom/_layout.scss
  19. 0  .themes/classic/sass/custom/_styles.scss
  20. 0  .themes/classic/sass/partials/_archive.scss
  21. 0  .themes/classic/sass/partials/_blog.scss
  22. 0  .themes/classic/sass/partials/_footer.scss
  23. 0  .themes/classic/sass/partials/_header.scss
  24. 0  .themes/classic/sass/partials/_navigation.scss
  25. 0  .themes/classic/sass/partials/_sharing.scss
  26. 0  .themes/classic/sass/partials/_sidebar.scss
  27. 0  .themes/classic/sass/partials/_syntax.scss
  28. 0  .themes/classic/sass/partials/sidebar/_base.scss
  29. 0  .themes/classic/sass/partials/sidebar/_delicious.scss
  30. 0  .themes/classic/sass/partials/sidebar/_googleplus.scss
  31. 0  .themes/classic/sass/partials/sidebar/_pinboard.scss
  32. 0  .themes/classic/sass/plugins/_plugins.scss
  33. 0  .themes/classic/sass/screen.scss
  34. 0  .themes/classic/source/_includes/after_footer.html
  35. 0  .themes/classic/source/_includes/archive_post.html
  36. 0  .themes/classic/source/_includes/article.html
  37. 0  .themes/classic/source/_includes/asides/delicious.html
  38. 0  .themes/classic/source/_includes/asides/github.html
  39. 0  .themes/classic/source/_includes/asides/googleplus.html
  40. 0  .themes/classic/source/_includes/asides/pinboard.html
  41. 0  .themes/classic/source/_includes/asides/recent_posts.html
  42. 0  .themes/classic/source/_includes/custom/after_footer.html
  43. 0  .themes/classic/source/_includes/custom/asides/about.html
  44. 0  .themes/classic/source/_includes/custom/category_feed.xml
  45. 0  .themes/classic/source/_includes/custom/footer.html
  46. 0  .themes/classic/source/_includes/custom/head.html
  47. 0  .themes/classic/source/_includes/custom/header.html
  48. 0  .themes/classic/source/_includes/custom/navigation.html
  49. 0  .themes/classic/source/_includes/disqus.html
  50. 0  .themes/classic/source/_includes/facebook_like.html
  51. 0  .themes/classic/source/_includes/footer.html
  52. 0  .themes/classic/source/_includes/google_analytics.html
  53. 0  .themes/classic/source/_includes/google_plus_one.html
  54. 0  .themes/classic/source/_includes/head.html
  55. 0  .themes/classic/source/_includes/header.html
  56. 0  .themes/classic/source/_includes/navigation.html
  57. 0  .themes/classic/source/_includes/post/author.html
  58. 0  .themes/classic/source/_includes/post/categories.html
  59. 0  .themes/classic/source/_includes/post/date.html
  60. 0  .themes/classic/source/_includes/post/disqus_thread.html
  61. 0  .themes/classic/source/_includes/post/sharing.html
  62. 0  .themes/classic/source/_includes/twitter_sharing.html
  63. 0  .themes/classic/source/_layouts/category_index.html
  64. 0  .themes/classic/source/_layouts/default.html
  65. 0  .themes/classic/source/_layouts/page.html
  66. 0  .themes/classic/source/_layouts/post.html
  67. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/background.png
  68. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png
  69. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/divider.png
  70. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png
  71. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
  72. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png
  73. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png
  74. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png
  75. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
  76. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png
  77. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png
  78. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png
  79. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png
  80. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png
  81. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
  82. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png
  83. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png
  84. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png
  85. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png
  86. 0  .themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png
  87. 0  .themes/classic/source/assets/jwplayer/glow/display/background.png
  88. 0  .themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png
  89. 0  .themes/classic/source/assets/jwplayer/glow/display/muteIcon.png
  90. 0  .themes/classic/source/assets/jwplayer/glow/display/playIcon.png
  91. 0  .themes/classic/source/assets/jwplayer/glow/dock/button.png
  92. 0  .themes/classic/source/assets/jwplayer/glow/glow.xml
  93. 0  .themes/classic/source/assets/jwplayer/glow/playlist/item.png
  94. 0  .themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png
  95. 0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png
  96. 0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png
  97. 0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png
  98. 0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png
  99. 0  .themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png
  100. 0  .themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png
  101. 0  .themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png
  102. 0  .themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png
  103. 0  .themes/classic/source/assets/jwplayer/player.swf
  104. 0  .themes/classic/source/atom.xml
  105. 0  .themes/classic/source/blog/archives/index.html
  106. 0  .themes/classic/source/favicon.png
  107. 0  .themes/classic/source/images/bird_32_gray.png
  108. 0  .themes/classic/source/images/bird_32_gray_fail.png
  109. 0  .themes/classic/source/images/code_bg.png
  110. 0  .themes/classic/source/images/dotted-border.png
  111. 0  .themes/classic/source/images/email.png
  112. 0  .themes/classic/source/images/line-tile.png
  113. 0  .themes/classic/source/images/noise.png
  114. 0  .themes/classic/source/images/rss.png
  115. 0  .themes/classic/source/images/search.png
  116. 0  .themes/classic/source/index.html
  117. 0  .themes/classic/source/javascripts/github.js
  118. 0  .themes/classic/source/javascripts/libs/jXHR.js
  119. 0  .themes/classic/source/javascripts/libs/jquery.min.js
  120. 0  .themes/classic/source/javascripts/libs/swfobject-dynamic.js
  121. 0  .themes/classic/source/javascripts/modernizr-2.0.js
  122. 0  .themes/classic/source/javascripts/octopress.js
  123. 0  .themes/classic/source/javascripts/pinboard.js
  124. 0  .themes/classic/source/javascripts/twitter.js
  125. 0  .themes/classic/source/robots.txt
  126. 0  .travis.yml
  127. 0  CHANGELOG.markdown
  128. 0  Gemfile
  129. 0  Gemfile.lock
  130. 0  README.markdown
  131. 0  Rakefile
  132. +24 −21 _config.yml
  133. +98 −0 _config.yml~
  134. 0  config.rb
  135. 0  config.ru
  136. 0  plugins/backtick_code_block.rb
  137. 0  plugins/blockquote.rb
  138. 0  plugins/category_generator.rb
  139. 0  plugins/code_block.rb
  140. 0  plugins/config_tag.rb
  141. 0  plugins/date.rb
  142. 0  plugins/gist_tag.rb
  143. 0  plugins/haml.rb
  144. 0  plugins/image_tag.rb
  145. 0  plugins/include_array.rb
  146. 0  plugins/include_code.rb
  147. 0  plugins/jsfiddle.rb
  148. 0  plugins/octopress_filters.rb
  149. 0  plugins/pagination.rb
  150. 0  plugins/post_filters.rb
  151. 0  plugins/preview_unpublished.rb
  152. 0  plugins/pullquote.rb
  153. 0  plugins/pygments_code.rb
  154. 0  plugins/raw.rb
  155. 0  plugins/render_partial.rb
  156. 0  plugins/rubypants.rb
  157. 0  plugins/sitemap_generator.rb
  158. 0  plugins/titlecase.rb
  159. 0  plugins/video_tag.rb
  160. 0  sass/_base.scss
  161. 0  sass/_partials.scss
  162. 0  sass/base/_layout.scss
  163. 0  sass/base/_solarized.scss
  164. 0  sass/base/_theme.scss
  165. 0  sass/base/_typography.scss
  166. 0  sass/base/_utilities.scss
  167. 0  sass/custom/_colors.scss
  168. 0  sass/custom/_fonts.scss
  169. 0  sass/custom/_layout.scss
  170. 0  sass/custom/_styles.scss
  171. 0  sass/partials/_archive.scss
  172. 0  sass/partials/_blog.scss
  173. 0  sass/partials/_footer.scss
  174. 0  sass/partials/_header.scss
  175. 0  sass/partials/_navigation.scss
  176. 0  sass/partials/_sharing.scss
  177. 0  sass/partials/_sidebar.scss
  178. 0  sass/partials/_syntax.scss
  179. 0  sass/partials/sidebar/_base.scss
  180. 0  sass/partials/sidebar/_delicious.scss
  181. 0  sass/partials/sidebar/_googleplus.scss
  182. 0  sass/partials/sidebar/_pinboard.scss
  183. 0  sass/plugins/_plugins.scss
  184. 0  sass/screen.scss
  185. 0  source/CNAME
  186. 0  source/_includes/after_footer.html
  187. 0  source/_includes/archive_post.html
  188. 0  source/_includes/article.html
  189. 0  source/_includes/asides/delicious.html
  190. 0  source/_includes/asides/github.html
  191. 0  source/_includes/asides/googleplus.html
  192. 0  source/_includes/asides/pinboard.html
  193. 0  source/_includes/asides/recent_posts.html
  194. 0  source/_includes/custom/after_footer.html
  195. 0  source/_includes/custom/asides/about.html
  196. 0  source/_includes/custom/category_feed.xml
  197. 0  source/_includes/custom/footer.html
  198. 0  source/_includes/custom/head.html
  199. 0  source/_includes/custom/header.html
  200. 0  source/_includes/custom/navigation.html
  201. +4 −0 source/_includes/custom/navigation.html~
  202. 0  source/_includes/disqus.html
  203. 0  source/_includes/facebook_like.html
  204. 0  source/_includes/footer.html
  205. 0  source/_includes/google_analytics.html
  206. 0  source/_includes/google_plus_one.html
  207. 0  source/_includes/head.html
  208. 0  source/_includes/header.html
  209. 0  source/_includes/navigation.html
  210. 0  source/_includes/post/author.html
  211. 0  source/_includes/post/categories.html
  212. 0  source/_includes/post/date.html
  213. 0  source/_includes/post/disqus_thread.html
  214. 0  source/_includes/post/sharing.html
  215. 0  source/_includes/twitter_sharing.html
  216. 0  source/_layouts/category_index.html
  217. 0  source/_layouts/default.html
  218. 0  source/_layouts/page.html
  219. 0  source/_layouts/post.html
  220. +43 −0 source/_posts/2013-03-29-zombie-ninjas-attack-a-survivors-retrospective.markdown
  221. +414 −0 source/_posts/2013-04-01-git-xue-xi-bi-ji-1.markdown
  222. +238 −0 source/_posts/2013-04-01-git-xue-xi-bi-ji-2.markdown
  223. 0  source/assets/jwplayer/glow/controlbar/background.png
  224. 0  source/assets/jwplayer/glow/controlbar/blankButton.png
  225. 0  source/assets/jwplayer/glow/controlbar/divider.png
  226. 0  source/assets/jwplayer/glow/controlbar/fullscreenButton.png
  227. 0  source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
  228. 0  source/assets/jwplayer/glow/controlbar/muteButton.png
  229. 0  source/assets/jwplayer/glow/controlbar/muteButtonOver.png
  230. 0  source/assets/jwplayer/glow/controlbar/normalscreenButton.png
  231. 0  source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
  232. 0  source/assets/jwplayer/glow/controlbar/pauseButton.png
  233. 0  source/assets/jwplayer/glow/controlbar/pauseButtonOver.png
  234. 0  source/assets/jwplayer/glow/controlbar/playButton.png
  235. 0  source/assets/jwplayer/glow/controlbar/playButtonOver.png
  236. 0  source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png
  237. 0  source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
  238. 0  source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png
  239. 0  source/assets/jwplayer/glow/controlbar/timeSliderProgress.png
  240. 0  source/assets/jwplayer/glow/controlbar/timeSliderRail.png
  241. 0  source/assets/jwplayer/glow/controlbar/unmuteButton.png
  242. 0  source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png
  243. 0  source/assets/jwplayer/glow/display/background.png
  244. 0  source/assets/jwplayer/glow/display/bufferIcon.png
  245. 0  source/assets/jwplayer/glow/display/muteIcon.png
  246. 0  source/assets/jwplayer/glow/display/playIcon.png
  247. 0  source/assets/jwplayer/glow/dock/button.png
  248. 0  source/assets/jwplayer/glow/glow.xml
  249. 0  source/assets/jwplayer/glow/playlist/item.png
  250. 0  source/assets/jwplayer/glow/playlist/itemOver.png
  251. 0  source/assets/jwplayer/glow/playlist/sliderCapBottom.png
  252. 0  source/assets/jwplayer/glow/playlist/sliderCapTop.png
  253. 0  source/assets/jwplayer/glow/playlist/sliderRail.png
  254. 0  source/assets/jwplayer/glow/playlist/sliderThumb.png
  255. 0  source/assets/jwplayer/glow/sharing/embedIcon.png
  256. 0  source/assets/jwplayer/glow/sharing/embedScreen.png
  257. 0  source/assets/jwplayer/glow/sharing/shareIcon.png
  258. 0  source/assets/jwplayer/glow/sharing/shareScreen.png
  259. 0  source/assets/jwplayer/player.swf
  260. 0  source/atom.xml
  261. 0  source/blog/archives/index.html
  262. 0  source/favicon.png
  263. 0  source/images/bird_32_gray.png
  264. 0  source/images/bird_32_gray_fail.png
  265. 0  source/images/code_bg.png
  266. 0  source/images/dotted-border.png
  267. 0  source/images/email.png
  268. 0  source/images/line-tile.png
  269. 0  source/images/noise.png
  270. 0  source/images/rss.png
  271. 0  source/images/search.png
  272. 0  source/index.html
  273. 0  source/javascripts/github.js
  274. 0  source/javascripts/libs/jXHR.js
  275. 0  source/javascripts/libs/jquery.min.js
  276. 0  source/javascripts/libs/swfobject-dynamic.js
  277. 0  source/javascripts/modernizr-2.0.js
  278. 0  source/javascripts/octopress.js
  279. 0  source/javascripts/pinboard.js
  280. 0  source/javascripts/twitter.js
  281. 0  source/robots.txt
View
0  .editorconfig 100644 → 100755
File mode changed
View
0  .gitattributes 100644 → 100755
File mode changed
View
0  .gitignore 100644 → 100755
File mode changed
View
0  .powrc 100644 → 100755
File mode changed
View
0  .rbenv-version 100644 → 100755
File mode changed
View
0  .rvmrc 100644 → 100755
File mode changed
View
0  .slugignore 100644 → 100755
File mode changed
View
0  .themes/classic/.editorconfig 100644 → 100755
File mode changed
View
0  .themes/classic/sass/_base.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/_partials.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/base/_layout.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/base/_solarized.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/base/_theme.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/base/_typography.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/base/_utilities.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/custom/_colors.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/custom/_fonts.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/custom/_layout.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/custom/_styles.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_archive.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_blog.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_footer.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_header.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_navigation.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_sharing.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_sidebar.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/_syntax.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/sidebar/_base.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/sidebar/_delicious.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/sidebar/_googleplus.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/partials/sidebar/_pinboard.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/plugins/_plugins.scss 100644 → 100755
File mode changed
View
0  .themes/classic/sass/screen.scss 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/after_footer.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/archive_post.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/article.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/asides/delicious.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/asides/github.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/asides/googleplus.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/asides/pinboard.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/asides/recent_posts.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/custom/after_footer.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/custom/asides/about.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/custom/category_feed.xml 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/custom/footer.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/custom/head.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/custom/header.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/custom/navigation.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/disqus.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/facebook_like.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/footer.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/google_analytics.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/google_plus_one.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/head.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/header.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/navigation.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/post/author.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/post/categories.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/post/date.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/post/disqus_thread.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/post/sharing.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_includes/twitter_sharing.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_layouts/category_index.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_layouts/default.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_layouts/page.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/_layouts/post.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/background.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/divider.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/display/background.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/display/muteIcon.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/display/playIcon.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/dock/button.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  .themes/classic/source/assets/jwplayer/glow/glow.xml 100644 → 100755
File mode changed
View
0  .themes/classic/source/assets/jwplayer/glow/playlist/item.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/assets/jwplayer/player.swf 100644 → 100755
File mode changed
View
0  .themes/classic/source/atom.xml 100644 → 100755
File mode changed
View
0  .themes/classic/source/blog/archives/index.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/favicon.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/bird_32_gray.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/bird_32_gray_fail.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/code_bg.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/dotted-border.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/email.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/line-tile.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/noise.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/rss.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/images/search.png 100644 → 100755
Diff not rendered
View
0  .themes/classic/source/index.html 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/github.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/libs/jXHR.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/libs/jquery.min.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/libs/swfobject-dynamic.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/modernizr-2.0.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/octopress.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/pinboard.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/javascripts/twitter.js 100644 → 100755
File mode changed
View
0  .themes/classic/source/robots.txt 100644 → 100755
File mode changed
View
0  .travis.yml 100644 → 100755
File mode changed
View
0  CHANGELOG.markdown 100644 → 100755
File mode changed
View
0  Gemfile 100644 → 100755
File mode changed
View
0  Gemfile.lock 100644 → 100755
File mode changed
View
0  README.markdown 100644 → 100755
File mode changed
View
0  Rakefile 100644 → 100755
File mode changed
View
45 _config.yml 100644 → 100755
@@ -3,11 +3,11 @@
# ----------------------- #
url: http://datawolf.github.com
-title: My Octopress Blog
-subtitle: A blogging framework for hackers.
-author: Your Name
+title: My Blog
+subtitle: Programming Your Future!
+author: datawolf
simple_search: http://google.com/search
-description:
+description: Practice makes perfect
# Default date format is "ordinal" (resulting in "July 22nd 2007")
# You can customize the format as defined in
@@ -19,7 +19,7 @@ date_format: "ordinal"
subscribe_rss: /atom.xml
subscribe_email:
# RSS feeds can list your email address if you like
-email:
+email: wanglong@cse.buaa.edu.cn
# ----------------------- #
# Jekyll & Plugins #
@@ -52,44 +52,47 @@ default_asides: [asides/recent_posts.html, asides/github.html, asides/delicious.
# blog_index_asides:
# post_asides:
# page_asides:
+blog_index_asides: [custom/asides/about.html, asides/recent_posts.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
+post_asides: [custom/asides/about.html, asides/recent_posts.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
+
# ----------------------- #
# 3rd Party Settings #
# ----------------------- #
# Github repositories
-github_user:
-github_repo_count: 0
-github_show_profile_link: true
+github_user: datawolf
+github_repo_count: 10
+github_show_profile_link: false
github_skip_forks: true
# Twitter
-twitter_user:
-twitter_tweet_button: true
+#twitter_user:
+#twitter_tweet_button: true
# Google +1
-google_plus_one: false
-google_plus_one_size: medium
+#google_plus_one:
+#google_plus_one_size: medium
# Google Plus Profile
# Hidden: No visible button, just add author information to search results
-googleplus_user:
-googleplus_hidden: false
+#googleplus_user:
+#googleplus_hidden: false
# Pinboard
-pinboard_user:
-pinboard_count: 3
+#pinboard_user:
+#pinboard_count: 3
# Delicious
-delicious_user:
+delicious_user: datawolf
delicious_count: 3
# Disqus Comments
-disqus_short_name:
-disqus_show_comment_count: false
+disqus_short_name: datawolf
+disqus_show_comment_count: true
# Google Analytics
-google_analytics_tracking_id:
+#google_analytics_tracking_id:
# Facebook Like
-facebook_like: false
+#facebook_like: false
View
98 _config.yml~
@@ -0,0 +1,98 @@
+# ----------------------- #
+# Main Configs #
+# ----------------------- #
+
+url: http://datawolf.github.com
+title: My Blog
+subtitle: Programming Your Future!
+author: datawolf
+simple_search: http://google.com/search
+description:
+
+# Default date format is "ordinal" (resulting in "July 22nd 2007")
+# You can customize the format as defined in
+# http://www.ruby-doc.org/core-1.9.2/Time.html#method-i-strftime
+# Additionally, %o will give you the ordinal representation of the day
+date_format: "ordinal"
+
+# RSS / Email (optional) subscription links (change if using something like Feedburner)
+subscribe_rss: /atom.xml
+subscribe_email:
+# RSS feeds can list your email address if you like
+email: wanglong@cse.buaa.edu.cn
+
+# ----------------------- #
+# Jekyll & Plugins #
+# ----------------------- #
+
+# If publishing to a subdirectory as in http://site.com/project set 'root: /project'
+root: /
+permalink: /blog/:year/:month/:day/:title/
+source: source
+destination: public
+plugins: plugins
+code_dir: downloads/code
+category_dir: blog/categories
+markdown: rdiscount
+pygments: false # default python pygments have been replaced by pygments.rb
+
+paginate: 10 # Posts per page on the blog index
+pagination_dir: blog # Directory base for pagination URLs eg. /blog/page/2/
+recent_posts: 5 # Posts in the sidebar Recent Posts section
+excerpt_link: "Read on →" # "Continue reading" link text at the bottom of excerpted articles
+
+titlecase: true # Converts page and post titles to titlecase
+
+# list each of the sidebar modules you want to include, in the order you want them to appear.
+# To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html'
+default_asides: [asides/recent_posts.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
+
+# Each layout uses the default asides, but they can have their own asides instead. Simply uncomment the lines below
+# and add an array with the asides you want to use.
+# blog_index_asides:
+# post_asides:
+# page_asides:
+blog_index_asides: [custom/asides/about.html, asides/recent_posts.html, asides/twitter.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
+post_asides: [custom/asides/about.html, asides/recent_posts.html, asides/twitter.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html]
+
+
+# ----------------------- #
+# 3rd Party Settings #
+# ----------------------- #
+
+# Github repositories
+github_user:datawolf
+github_repo_count: 10
+github_show_profile_link: true
+github_skip_forks: true
+
+# Twitter
+twitter_user:
+twitter_tweet_button: true
+
+# Google +1
+google_plus_one: false
+google_plus_one_size: medium
+
+# Google Plus Profile
+# Hidden: No visible button, just add author information to search results
+googleplus_user:
+googleplus_hidden: false
+
+# Pinboard
+pinboard_user:
+pinboard_count: 3
+
+# Delicious
+delicious_user: datawolf
+delicious_count: 3
+
+# Disqus Comments
+disqus_short_name:
+disqus_show_comment_count: false
+
+# Google Analytics
+google_analytics_tracking_id:
+
+# Facebook Like
+facebook_like: false
View
0  config.rb 100644 → 100755
File mode changed
View
0  config.ru 100644 → 100755
File mode changed
View
0  plugins/backtick_code_block.rb 100644 → 100755
File mode changed
View
0  plugins/blockquote.rb 100644 → 100755
File mode changed
View
0  plugins/category_generator.rb 100644 → 100755
File mode changed
View
0  plugins/code_block.rb 100644 → 100755
File mode changed
View
0  plugins/config_tag.rb 100644 → 100755
File mode changed
View
0  plugins/date.rb 100644 → 100755
File mode changed
View
0  plugins/gist_tag.rb 100644 → 100755
File mode changed
View
0  plugins/haml.rb 100644 → 100755
File mode changed
View
0  plugins/image_tag.rb 100644 → 100755
File mode changed
View
0  plugins/include_array.rb 100644 → 100755
File mode changed
View
0  plugins/include_code.rb 100644 → 100755
File mode changed
View
0  plugins/jsfiddle.rb 100644 → 100755
File mode changed
View
0  plugins/octopress_filters.rb 100644 → 100755
File mode changed
View
0  plugins/pagination.rb 100644 → 100755
File mode changed
View
0  plugins/post_filters.rb 100644 → 100755
File mode changed
View
0  plugins/preview_unpublished.rb 100644 → 100755
File mode changed
View
0  plugins/pullquote.rb 100644 → 100755
File mode changed
View
0  plugins/pygments_code.rb 100644 → 100755
File mode changed
View
0  plugins/raw.rb 100644 → 100755
File mode changed
View
0  plugins/render_partial.rb 100644 → 100755
File mode changed
View
0  plugins/rubypants.rb 100644 → 100755
File mode changed
View
0  plugins/sitemap_generator.rb 100644 → 100755
File mode changed
View
0  plugins/titlecase.rb 100644 → 100755
File mode changed
View
0  plugins/video_tag.rb 100644 → 100755
File mode changed
View
0  sass/_base.scss 100644 → 100755
File mode changed
View
0  sass/_partials.scss 100644 → 100755
File mode changed
View
0  sass/base/_layout.scss 100644 → 100755
File mode changed
View
0  sass/base/_solarized.scss 100644 → 100755
File mode changed
View
0  sass/base/_theme.scss 100644 → 100755
File mode changed
View
0  sass/base/_typography.scss 100644 → 100755
File mode changed
View
0  sass/base/_utilities.scss 100644 → 100755
File mode changed
View
0  sass/custom/_colors.scss 100644 → 100755
File mode changed
View
0  sass/custom/_fonts.scss 100644 → 100755
File mode changed
View
0  sass/custom/_layout.scss 100644 → 100755
File mode changed
View
0  sass/custom/_styles.scss 100644 → 100755
File mode changed
View
0  sass/partials/_archive.scss 100644 → 100755
File mode changed
View
0  sass/partials/_blog.scss 100644 → 100755
File mode changed
View
0  sass/partials/_footer.scss 100644 → 100755
File mode changed
View
0  sass/partials/_header.scss 100644 → 100755
File mode changed
View
0  sass/partials/_navigation.scss 100644 → 100755
File mode changed
View
0  sass/partials/_sharing.scss 100644 → 100755
File mode changed
View
0  sass/partials/_sidebar.scss 100644 → 100755
File mode changed
View
0  sass/partials/_syntax.scss 100644 → 100755
File mode changed
View
0  sass/partials/sidebar/_base.scss 100644 → 100755
File mode changed
View
0  sass/partials/sidebar/_delicious.scss 100644 → 100755
File mode changed
View
0  sass/partials/sidebar/_googleplus.scss 100644 → 100755
File mode changed
View
0  sass/partials/sidebar/_pinboard.scss 100644 → 100755
File mode changed
View
0  sass/plugins/_plugins.scss 100644 → 100755
File mode changed
View
0  sass/screen.scss 100644 → 100755
File mode changed
View
0  source/CNAME 100644 → 100755
File mode changed
View
0  source/_includes/after_footer.html 100644 → 100755
File mode changed
View
0  source/_includes/archive_post.html 100644 → 100755
File mode changed
View
0  source/_includes/article.html 100644 → 100755
File mode changed
View
0  source/_includes/asides/delicious.html 100644 → 100755
File mode changed
View
0  source/_includes/asides/github.html 100644 → 100755
File mode changed
View
0  source/_includes/asides/googleplus.html 100644 → 100755
File mode changed
View
0  source/_includes/asides/pinboard.html 100644 → 100755
File mode changed
View
0  source/_includes/asides/recent_posts.html 100644 → 100755
File mode changed
View
0  source/_includes/custom/after_footer.html 100644 → 100755
File mode changed
View
0  source/_includes/custom/asides/about.html 100644 → 100755
File mode changed
View
0  source/_includes/custom/category_feed.xml 100644 → 100755
File mode changed
View
0  source/_includes/custom/footer.html 100644 → 100755
File mode changed
View
0  source/_includes/custom/head.html 100644 → 100755
File mode changed
View
0  source/_includes/custom/header.html 100644 → 100755
File mode changed
View
0  source/_includes/custom/navigation.html 100644 → 100755
File mode changed
View
4 source/_includes/custom/navigation.html~
@@ -0,0 +1,4 @@
+<ul class="main-navigation">
+ <li><a href="{{ root_url }}/">Blog</a></li>
+ <li><a href="{{ root_url }}/blog/archives">Archives</a></li>
+</ul>
View
0  source/_includes/disqus.html 100644 → 100755
File mode changed
View
0  source/_includes/facebook_like.html 100644 → 100755
File mode changed
View
0  source/_includes/footer.html 100644 → 100755
File mode changed
View
0  source/_includes/google_analytics.html 100644 → 100755
File mode changed
View
0  source/_includes/google_plus_one.html 100644 → 100755
File mode changed
View
0  source/_includes/head.html 100644 → 100755
File mode changed
View
0  source/_includes/header.html 100644 → 100755
File mode changed
View
0  source/_includes/navigation.html 100644 → 100755
File mode changed
View
0  source/_includes/post/author.html 100644 → 100755
File mode changed
View
0  source/_includes/post/categories.html 100644 → 100755
File mode changed
View
0  source/_includes/post/date.html 100644 → 100755
File mode changed
View
0  source/_includes/post/disqus_thread.html 100644 → 100755
File mode changed
View
0  source/_includes/post/sharing.html 100644 → 100755
File mode changed
View
0  source/_includes/twitter_sharing.html 100644 → 100755
File mode changed
View
0  source/_layouts/category_index.html 100644 → 100755
File mode changed
View
0  source/_layouts/default.html 100644 → 100755
File mode changed
View
0  source/_layouts/page.html 100644 → 100755
File mode changed
View
0  source/_layouts/post.html 100644 → 100755
File mode changed
View
43 source/_posts/2013-03-29-zombie-ninjas-attack-a-survivors-retrospective.markdown
@@ -0,0 +1,43 @@
+---
+layout: post
+title: "Zombie Ninjas Attack: A survivor's retrospective"
+date: 2013-03-29 16:24
+comments: true
+categories: Saas
+---
+
+``` ruby Discover if a number is prime http://www.noulakaz.net/weblog/2007/03/18/a-regular-expression-to-check-for-prime-numbers/ Source Article
+class Fixnum
+ def prime?
+ ('1' * self) !~ /^1?$|^(11+?)\1+$/
+ end
+end
+```
+<!--more-->
+code test
+
+``` c 世界, 你好! http://wiki.l-cloud.org/ 源代码
+
+#include <stdio.h>
+
+int main(int argc, char** argv)
+{
+ printf("hello world!\n");
+ return 0;
+}
+```
+{% gist 996818 %}
+
+code test 1
+
+{% codeblock %}
+Awesome code snippet
+{% endcodeblock %}
+
+
+{% blockquote %}
+Last night I lay in bed looking up at the stars in the sky and I thought to myself, where the heck is the ceiling.
+{% endblockquote %}
+
+
+{% render_partial ../README.markdown %}
View
414 source/_posts/2013-04-01-git-xue-xi-bi-ji-1.markdown
@@ -0,0 +1,414 @@
+---
+layout: post
+title: "git 学习笔记 1"
+date: 2013-04-01 09:37
+comments: true
+categories:
+---
+
+安装和初始化
+======
+
+配置全局用户名和电子邮件地址
+``` bash
+$ git config --global user.name "yourname"
+$ git config --global user.email "yourname@mail.com"
+```
+
+为特定版本库配置用户名和电子邮件
+``` bash
+$ cd /path/to/repo
+$ git config user.name "yourname"
+$ git config user.email "yourname@mail.com"
+```
+
+
+查看配置
+``` bash
+$ git config --global --list
+user.name=yourname
+user.email=yourname@mail.com
+```
+
+
+在命令行中使用不同的颜色显示不同类型的内容,需要设置``color.ui``的值为``auto``或者``always``
+``` bash
+$ git config --global color.ui "auto"
+```
+
+初始化新版本库
+``` bash
+$ mkdir /path/to/repo
+$ cd /path/to/repo
+$ git init
+$ git add .
+$ git commit -m "initial import"
+```
+
+克隆版本库
+``` bash
+$ git clone <repository url>
+```
+
+将目录中的内容纳入到git版本控制
+``` bash
+$ cd /path/to/existing/directory
+$ git init
+$ git add .
+$ git commit -m "initial import of some project"
+```
+
+<!-- more -->
+
+在本地版本库中设置远程版本库的别名
+``` bash
+$ git remote add <remote repository> <repository url>
+
+```
+日常操作
+====
+添加新文件或暂存已有文件上的改动,然后提交
+``` bash
+$ git add <some file>
+$ git commit -m "<some message>"
+```
+替换已有文件上的部分修改
+``` bash
+$ git add -p [<some file> [<some file> [and so on]]]
+```
+
+使用交互式添加文件
+``` bash
+$ git add -i
+```
+
+暂存已纳入git版本控制之下的文件的修改
+``` bash
+$ git add -u [<some file> [<some file>]]
+```
+
+提交已纳入git版本控制之下的文件的所有修改
+``` bash
+$ git commit -m "<some message>" -a
+```
+
+清除工作目录树中的修改
+``` bash
+$ git checkout HEAD <some file> [<some file>]
+```
+
+取消已暂存但尚未提交的修改的暂存标识
+``` bash
+$ git reset HEAD <some file> [<some file>]
+```
+
+修复上一次提交中的问题,改动相关文件并暂存……
+``` bash
+$ git commit -m "<some message>" --amend
+```
+
+修复上一次提交中的内容,并复用上次的提交注释
+``` bash
+$ git commit -C HEAD --amend
+```
+
+分支
+==
+
+列出本地分支
+``` bash
+$ git branch
+```
+列出远程分支
+``` bash
+$ git branch -r
+```
+列出所有分支
+``` bash
+$ git branch -a
+```
+基于当前分支(的末稍)创建新分支
+``` bash
+$ git branch <new branch>
+```
+检出另一条分支
+``` bash
+$ git checkout <new branch>
+```
+基于当前分支创建新分支,同时检出该分支
+``` bash
+$ git checkout -b <new branch>
+```
+基于另一个起点,创建新分支
+``` bash
+$ git branch <some existing branch> <start point>
+```
+创建同名新分支,覆盖已有分支
+``` bash
+$ git branch -f <some existing branch> [<start point>]
+```
+移动或重命名分支
+1、只有当<new branch name>不存在时
+``` bash
+$ git checkout -m <existing branch name> <new branch name>
+```
+2、如果<new branch name>以存在,就覆盖她
+``` bash
+$ git checkout -M <existing branch name> <new branch name>
+```
+
+把另一条分支合并到当前分支
+``` bash
+$ git merge <some branch>
+```
+
+合并但不提交
+``` bash
+$ git merge --no-commit <some branch>
+```
+拣选合并,并且提交
+``` bash
+$ git cherry-pick <commit name>
+```
+拣选合并,但不提交
+``` bash
+$ git cherry-pick -n <commit name>
+```
+把一条分支上的内容压和到另一条分支(上的一个提交)
+``` bash
+$ git merge --squash <some branch>
+```
+
+删除分支
+
+1、进当欲删除分支已经合并到当前分支时
+``` bash
+$ git branch -d <branch to delete>
+```
+2、不论欲删除分支是否已合并到当前分支上
+``` bash
+$ git branch -D <branch to delete>
+```
+
+举例说明
+====
+
+
+添加一个文件index.html,使用``git add``命令将该文件添加到版本库的索引
+``` bash
+$ git add index.html
+```
+
+使用``git commit``命令提交,即创建一个``提交记录``
+``` bash
+$ git commit -m "add in hello world HTML"
+```
+
+查看提交的相关信息
+``` bash
+$ git log
+```
+
+在项目中工作,修改了index.html,显示工作树的状态
+``` bash
+$ git status
+$ git add index.html
+$ git status
+```
+Git可以接受任意多次的留言的输入,每一次另起一段
+``` bash
+$ git commit -m "add xxx to xxx" \
+ -m "this is the second commit document"
+```
+
+提交所有的修改
+``` bash
+$ git commit -a
+```
+
+Git 输出一个提交条目或者多个提交条目,使用``-num``参数
+``` bash
+$ git log -1
+$ git log -2
+$ git log -5
+```
+
+创建一个分支,需要两个参数,第一个是新分支名称,第二个是父分支名称
+``` bash
+$ git branch RB_1.0 master
+```
+
+切换到分支RB_1.0
+``` bash
+$ git checkout RB_1.0
+```
+
+处理发布时,打标签命令。需要两个参数,第一个是标签的名称,第二个是分支的末稍
+``` bash
+$ git tag 1.0 RB_1.0
+```
+
+查看版本库中的标签列表
+``` bash
+$ git tag
+```
+
+分支合并,使用变基命令,``git rebase`` 跟一个参数,指的是变基到哪一条分支的末稍。
+将master分支变基到RB_1.0分支的末稍
+``` bash
+$ git checkout master
+$ git rebase RB_1.0
+```
+删除分支RB_1.0
+``` bash
+$ git branch -d RB_1.0
+```
+删除分支后,只是删除了分支的名称,不会删除分支上的任何实际内容,可以使用标签来找到从标签
+到版本树起点的一连串的提交记录
+
+打补丁时创建分支的过程
+``` bash
+$ git branch RB_1.0.1 1.0
+$ git checkout RB_1.0.1
+```
+修改完后在合并到分支1.0中。
+
+快速产看历史记录
+``` bash
+$ git log --pretty=oneline
+```
+
+为代码发布创建归档文件
+``` bash
+$ git archive --format=tar \
+ --prefix=mysite-1.0/ 1.0 \
+ | gzip > mysite-1.0.tar.gz
+```
+或者
+``` bash
+$ git archive --format=zip \
+ --prefix=mysite-1.0/ 1.0 \
+ > mysite-1.0.zip
+```
+
+克隆远程版本库
+``` bash
+$ git clone http://github.com/tswicegood/mysite.git mysite-remote
+```
+
+提交修改有三种方法
+
+1、先暂存,在提交
+```bash
+$ git add some-file
+$ git commit -m "changes to some-file"
+```
+
+2、直接提交,提交工作目录树中的所有修改。
+``` bash
+$ git commit -m "changes to some-file" -a
+```
+
+3、直接修改,提交工作目录树中指定的修改。
+``` bash
+$ git commit -m "changes to some-file" some-file
+```
+
+将命令``git commit``简写为``git ci``:
+``` bash
+$ git config --global alias.ci "commit"
+```
+查看工作目录树中所有的改动
+``` bash
+$ git status
+```
+
+比较工作目录树与暂存区之间的区别
+``` bash
+$ git diff
+```
+
+比较暂存区和版本库直接的区别
+```
+$ git diff --cached
+```
+
+比较工作目录树(包括暂存和未暂存的修改)与版本库中的区别
+
+```
+$ git diff HEAD
+```
+``HEAD``指的是当前所在分支末稍的最新提交。
+
+文件重命名与移动
+```
+$ git mv index.html hello.html
+$ git status
+$ git commit -m "rename to more appropriate name"
+```
+
+忽略文件
+
+1、可以在工作目录树下设置文件``.gitignore``来设置版本库级别的忽略。
+
+2、可以通过编辑``.git/info/exclude``来设置本地级的忽略。
+
+修改分支的名称,``-m``不会覆盖已有的分支名称,所以新分支必须是唯一的。
+``` bash
+$ git branch -m master mymaster
+```
+
+创建新分支
+``` bash
+$ git branch new
+$ git branch
+```
+检出刚才创建的分支
+``` bash
+$ git checkout new
+```
+用快捷方法创建新分支``alternate``
+``` bash
+$ git checkout -b alternate master
+```
+
+合并分支间的修改
+
+1、直接合并
+
+``` bash
+$ git branch
+* alternate
+ master
+$ touch about.html
+$ git add about.html
+$ git commit -m "add the skeleton of an about page"
+$ git checkout master
+$ git merge alternate
+```
+
+2、压合合并
+``` bash
+$ git checkout -b contact master
+$ git add contact.html
+$ git commit -m "add contact file with email"
+#修改contact.html文件
+$ git commit -m "add secondary email" -a
+$ git checkout master
+$ git merge --squash contact
+$ git status
+$ git commit -m "add contact" \
+ -m "has primary and secondary email."
+```
+
+3、拣选合并``git cherry-pick``
+``` bash
+$ git cherry-pick 9826311
+$ git cherry-pick -n 9826311
+```
+
+删除分支,``-d``删除合并了的分支,``-D``删除未合并的分支
+``` bash
+$ git branch -d about2
+$ git branch -D about
+```
View
238 source/_posts/2013-04-01-git-xue-xi-bi-ji-2.markdown
@@ -0,0 +1,238 @@
+---
+layout: post
+title: "git 学习笔记 2"
+date: 2013-04-01 14:14
+comments: true
+categories:
+---
+
+历史
+==
+
+显示全部历史记录
+``` bash
+$ git log
+```
+显示版本历史,以及版本间的内容差异
+``` bash
+$ git log -p
+```
+只显示最近一个提交
+``` bash
+$ git log -1
+```
+显示最近的20个提交,以及版本间的内容差异
+``` bash
+$ git log -20 -p
+```
+显示最近6个小时的提交
+``` bash
+$ git log --since="6 hours"
+```
+显示两天前的提交
+``` bash
+$ git log --before="2 days"
+```
+显示比HEAD(当前检出分支的末稍)早三个提交的那个提交
+``` bash
+$ git log -1 HEAD~3
+$ git log -1 HEAD^^^
+$ git log -1 HEAD~1^^
+```
+显示两个版本直接的提交
+``` bash
+$ git log <start point>...<end point>
+```
+<!-- more -->
+显示历史,每一个提交显示一行,包括提交注释的第一行
+``` bash
+$ git log --pretty=oneline
+```
+显示改动行数统计
+``` bash
+$ git log --stat
+```
+显示改动文件的名称和状态
+``` bash
+$ git log --name-status
+```
+显示当前工作目录树和暂存区间的差别
+``` bash
+$ git diff
+```
+显示暂存区和版本库之间的差别
+``` bash
+$ git diff --cached
+```
+显示工作目录树和版本库间的差别
+``` bash
+$ git diff HEAD
+```
+显示工作目录树和版本库中某次提交版本之间的差别
+``` bash
+$ git diff <start point>
+```
+显示版本库中两个版本之间的差别
+``` bash
+$ git diff <start point> <end point>
+```
+显示差别的相关统计
+``` bash
+$ git diff --stat <start point> [<end point>]
+```
+显示文件中各个部分的修改者及相关提交信息
+``` bash
+$ git blame <some file>
+```
+显示文件中各部分的修改者及相关提交信息,包括在文件移动内容方面的情况
+``` bash
+$ git blame <some file>
+$ git blame -M <some file>
+```
+显示历史时,显示复制和粘贴信息
+``` bash
+$ git log -C -C -p -1 <some point>
+```
+
+远程版本库
+=====
+克隆远程版本库
+``` bash
+$ git clone <some repository>
+```
+克隆版本库,但只下载其中最近200个提交的历史记录
+``` bash
+$ git clone --depth 200 <some repository>
+```
+在本地版本库中设置远程版本库的别名
+``` bash
+$ git remote add <remote repository> <repository url>
+```
+显示远程分支
+``` bash
+$ git branch -r
+```
+基于远程分支创建本地分支
+``` bash
+$ git branch <new branch> <remote branch>
+```
+
+基于远程标签创建本地分支
+``` bash
+$ git branch <new branch> <remote tag>
+```
+从别名为``orgin``的远程版本库中取来修改变化,但不合并到本地分支
+``` bash
+$ git fetch
+```
+从任意的远程版本库中取来修改变化,但不合并到本地分支
+``` bash
+$ git fetch <remote repository>
+```
+从任意的远程版本库中取来修改变化,并合并到当前检出的本地分支
+``` bash
+$ git pull <remote repository>
+```
+从别名``orgin``的远程版本库中取来修改变化,并合并到当前检出的本地分支
+``` bash
+$ git pull
+```
+把修改变化从本地分支推入远程版本库
+``` bash
+$ git push <remote repository> <local branch>:<remote branch>
+```
+把修改变化从本地分支推入远程版本库中同名分支
+``` bash
+$ git push <remote repository> <local branch>
+```
+把修改变化从本地新建分支推入远程版本库
+``` bash
+$ git push <remote repository> <local branch>
+```
+把修改变化推入别名为``orgin``的远程版本库
+``` bash
+$ git push
+```
+在远程版本库中删除分支
+``` bash
+$ git push <remote repository> :<remote branch>
+```
+在本地版本库中删除所有远程版本库中已不存在的分支
+``` bash
+$ git remote prune <remote repository>
+```
+在本地版本库中删除某个远程版本库的简称,以及该远程版本库相关的分支
+``` bash
+$ git remote rm <remote repository>
+```
+
+操作示例
+====
+查看git日志
+``` bash
+$ git log
+$ git log 7b1558c
+$ git log -10
+$ git log --since="5 hours"
+$ git log --since="5 hours" -1
+$ git log 18f822e..0bb3dfb
+$ git log 18f822e..HEAD
+$ git log --pretty=format:"%h %s" 1.0..HEAD
+
+```
+
+查看版本之间的差异
+``` bash
+$ git diff 18f822e
+$ git diff --stat 1.0
+```
+
+查明该向谁问责
+``` bash
+$ git blame hello.html
+$ git blame -L 12,13 hello.html
+$ git blame -L 12,+2 hello.html
+$ git blame -L 12,-2 hello.html
+$ git blame -: "/<\/body>/",+2 hello.html
+```
+
+复位操作,将版本库复位到``HEAD``之前的那个版本了
+``` bash
+$ git reset --hard HEAD^
+```
+显示远程分支
+``` bash
+$ git branch
+* master
+$ git branch -r
+ origin/HEAD -> origin/master
+ origin/about
+ origin/alternate
+ origin/contacts
+ origin/master
+ origin/new
+
+```
+
+更新远程分支,但不会把远程分支上的修改合并到本地分支上。
+``` bash
+$ git fetch
+```
+
+取来远程分支并且合并,需要两个参数,一个是远程版本库名称,另一个需要拖入的远程分支名称
+``` bash
+$ git pull
+```
+
+推入改动,调用不带参数的``git push``命令时,git会推入到默认版本库origin中,并把本地版本库中当前所在分支的
+变更推入到远程版本库对应的分支上。
+``` bash
+$ git push
+```
+
+将本地分支上``mybranch``上的提交推入远程版本库的主分支上
+``` bash
+$ git push origin mybranch:master
+```
+
+添加新的远程版本库,必须有相应的权限
View
0  source/assets/jwplayer/glow/controlbar/background.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/blankButton.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/divider.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/fullscreenButton.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/muteButton.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/muteButtonOver.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/normalscreenButton.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/pauseButton.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/pauseButtonOver.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/playButton.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/playButtonOver.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/timeSliderProgress.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/timeSliderRail.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/unmuteButton.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/display/background.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/display/bufferIcon.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/display/muteIcon.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/display/playIcon.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/dock/button.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/glow.xml 100644 → 100755
File mode changed
View
0  source/assets/jwplayer/glow/playlist/item.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/playlist/itemOver.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/playlist/sliderCapBottom.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/playlist/sliderCapTop.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/playlist/sliderRail.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/playlist/sliderThumb.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/sharing/embedIcon.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/sharing/embedScreen.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/sharing/shareIcon.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/glow/sharing/shareScreen.png 100644 → 100755
Diff not rendered
View
0  source/assets/jwplayer/player.swf 100644 → 100755
File mode changed
View
0  source/atom.xml 100644 → 100755
File mode changed
View
0  source/blog/archives/index.html 100644 → 100755
File mode changed
View
0  source/favicon.png 100644 → 100755
Diff not rendered
View
0  source/images/bird_32_gray.png 100644 → 100755
Diff not rendered
View
0  source/images/bird_32_gray_fail.png 100644 → 100755
Diff not rendered
View
0  source/images/code_bg.png 100644 → 100755
Diff not rendered
View
0  source/images/dotted-border.png 100644 → 100755
Diff not rendered
View
0  source/images/email.png 100644 → 100755
Diff not rendered
View
0  source/images/line-tile.png 100644 → 100755
Diff not rendered
View
0  source/images/noise.png 100644 → 100755
Diff not rendered
View
0  source/images/rss.png 100644 → 100755
Diff not rendered
View
0  source/images/search.png 100644 → 100755
Diff not rendered
View
0  source/index.html 100644 → 100755
File mode changed
View
0  source/javascripts/github.js 100644 → 100755
File mode changed
View
0  source/javascripts/libs/jXHR.js 100644 → 100755
File mode changed
View
0  source/javascripts/libs/jquery.min.js 100644 → 100755
File mode changed
View
0  source/javascripts/libs/swfobject-dynamic.js 100644 → 100755
File mode changed
View
0  source/javascripts/modernizr-2.0.js 100644 → 100755
File mode changed
View
0  source/javascripts/octopress.js 100644 → 100755
File mode changed
View
0  source/javascripts/pinboard.js 100644 → 100755
File mode changed
View
0  source/javascripts/twitter.js 100644 → 100755
File mode changed
View
0  source/robots.txt 100644 → 100755
File mode changed
Please sign in to comment.
Something went wrong with that request. Please try again.