avm-tools 0.46.0 → 0.51.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (377) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +8 -0
  3. data/lib/avm/data/package/dump.rb +1 -1
  4. data/lib/avm/git/issue/complete.rb +1 -1
  5. data/lib/avm/git/issue/complete/_test.rb +17 -3
  6. data/lib/avm/git/issue/complete/_validations.rb +9 -14
  7. data/lib/avm/git/issue/complete/validation.rb +31 -0
  8. data/lib/avm/git/revision_test.rb +2 -2
  9. data/lib/avm/instances/configuration/_rubocop.rb +1 -1
  10. data/lib/avm/instances/configuration/_tests.rb +14 -0
  11. data/lib/avm/rails.rb +9 -0
  12. data/lib/avm/rails/runners.rb +11 -0
  13. data/lib/avm/rails/runners/bundle.rb +35 -0
  14. data/lib/avm/rails/runners/runner.rb +48 -0
  15. data/lib/avm/ruby.rb +0 -20
  16. data/lib/avm/ruby/gems.rb +11 -0
  17. data/lib/avm/ruby/gems/generator.rb +168 -0
  18. data/lib/avm/ruby/rubocop/_gemfile.rb +1 -1
  19. data/lib/avm/stereotypes/eac_redmine_base0/deploy.rb +2 -2
  20. data/lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb +1 -1
  21. data/lib/avm/tools/runner/eac_rails_base0/bundle.rb +14 -0
  22. data/lib/avm/tools/runner/eac_rails_base0/runner.rb +14 -0
  23. data/lib/avm/tools/runner/eac_redmine_base0/bundle.rb +2 -24
  24. data/lib/avm/tools/runner/eac_redmine_base0/runner.rb +14 -0
  25. data/lib/avm/tools/runner/files/format.rb +1 -1
  26. data/lib/avm/tools/runner/git.rb +1 -1
  27. data/lib/avm/tools/runner/git/deploy.rb +2 -2
  28. data/lib/avm/tools/runner/ruby/gems.rb +22 -0
  29. data/lib/avm/tools/runner/ruby/gems/generate.rb +50 -0
  30. data/lib/avm/tools/version.rb +1 -1
  31. data/lib/eac_launcher/git/base.rb +11 -5
  32. data/lib/eac_launcher/git/base/class_methods.rb +26 -0
  33. data/lib/eac_launcher/git/base/dirty_files.rb +30 -0
  34. data/lib/eac_launcher/git/base/remotes.rb +38 -0
  35. data/lib/eac_launcher/git/base/underlying.rb +10 -0
  36. data/template/avm/ruby/gems/generator/gemspec.template +18 -0
  37. data/template/avm/ruby/gems/generator/root_lib.template +7 -0
  38. data/template/avm/ruby/gems/generator/static/Gemfile +5 -0
  39. data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb +7 -0
  40. data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb +100 -0
  41. data/template/avm/ruby/gems/generator/version.template +5 -0
  42. data/vendor/gems/eac_ruby_utils/Gemfile +16 -0
  43. data/vendor/gems/eac_ruby_utils/MIT-LICENCE +16 -0
  44. data/vendor/gems/eac_ruby_utils/README.rdoc +3 -0
  45. data/vendor/gems/eac_ruby_utils/eac_ruby_utils.gemspec +24 -0
  46. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils.rb +6 -0
  47. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/arguments_consumer.rb +81 -0
  48. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/by_reference.rb +23 -0
  49. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb +68 -0
  50. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb +133 -0
  51. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/configs.rb +74 -0
  52. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb +66 -0
  53. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console.rb +5 -0
  54. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/configs.rb +135 -0
  55. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner.rb +39 -0
  56. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb +18 -0
  57. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_doc.rb +25 -0
  58. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_settings.rb +19 -0
  59. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb +139 -0
  60. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker.rb +133 -0
  61. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_class_methods.rb +39 -0
  62. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_constants.rb +14 -0
  63. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/list.rb +63 -0
  64. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/node.rb +26 -0
  65. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/contextualizable.rb +16 -0
  66. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/core_ext.rb +5 -0
  67. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/custom_format.rb +53 -0
  68. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs.rb +23 -0
  69. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/base_env.rb +28 -0
  70. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb +168 -0
  71. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb +46 -0
  72. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb +51 -0
  73. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/file.rb +22 -0
  74. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/local_env.rb +17 -0
  75. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/process.rb +19 -0
  76. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/spawn.rb +32 -0
  77. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env.rb +72 -0
  78. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb +53 -0
  79. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs.rb +9 -0
  80. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/extname.rb +30 -0
  81. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp.rb +52 -0
  82. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/directory.rb +16 -0
  83. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/file.rb +34 -0
  84. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/traversable.rb +47 -0
  85. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs/traverser.rb +74 -0
  86. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/fs_cache.rb +11 -0
  87. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable.rb +17 -0
  88. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/class_methods.rb +14 -0
  89. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/instance_methods.rb +30 -0
  90. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/integer_list.rb +23 -0
  91. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb +93 -0
  92. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/lists.rb +59 -0
  93. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/string_list.rb +19 -0
  94. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/symbol_list.rb +19 -0
  95. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb +38 -0
  96. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/on_clean_ruby_environment.rb +12 -0
  97. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/options_consumer.rb +62 -0
  98. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patch.rb +11 -0
  99. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches.rb +4 -0
  100. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/class.rb +4 -0
  101. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/class/common_constructor.rb +9 -0
  102. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable.rb +4 -0
  103. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable/boolean_combinations.rb +45 -0
  104. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash.rb +5 -0
  105. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/options_consumer.rb +10 -0
  106. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/sym_keys_hash.rb +10 -0
  107. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module.rb +4 -0
  108. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/common_concern.rb +10 -0
  109. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/console_speaker.rb +10 -0
  110. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/listable.rb +10 -0
  111. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb +9 -0
  112. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb +9 -0
  113. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb +10 -0
  114. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb +5 -0
  115. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb +14 -0
  116. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb +19 -0
  117. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb +16 -0
  118. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb +15 -0
  119. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname.rb +4 -0
  120. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb +9 -0
  121. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb +4 -0
  122. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb +16 -0
  123. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb +4 -0
  124. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb +5 -0
  125. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/patches/time/local_time_zone.rb +25 -0
  126. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb +93 -0
  127. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb +54 -0
  128. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec.rb +9 -0
  129. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec/conditional.rb +38 -0
  130. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/rspec/stubbed_ssh.rb +44 -0
  131. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb +9 -0
  132. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb +31 -0
  133. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb +26 -0
  134. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb +65 -0
  135. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +42 -0
  136. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates.rb +9 -0
  137. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/directory.rb +110 -0
  138. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/file.rb +50 -0
  139. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/searcher.rb +55 -0
  140. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_not_found_error.rb +7 -0
  141. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers.rb +25 -0
  142. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/base.rb +23 -0
  143. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/entries_reader.rb +25 -0
  144. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/generic.rb +25 -0
  145. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/hash.rb +29 -0
  146. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/version.rb +5 -0
  147. data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb +96 -0
  148. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/arguments_consumer_spec.rb +17 -0
  149. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb +42 -0
  150. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb +37 -0
  151. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/configs_spec.rb +31 -0
  152. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/configs_spec.rb +14 -0
  153. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/docopt_runner_spec.rb +136 -0
  154. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/console/speaker_spec.rb +36 -0
  155. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/custom_format_spec.rb +60 -0
  156. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/executable_spec.rb +37 -0
  157. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/ssh_env_spec.rb +25 -0
  158. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/filesystem_cache_spec.rb +32 -0
  159. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb +18 -0
  160. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp/temp_spec.rb +12 -0
  161. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp_spec.rb +52 -0
  162. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb +212 -0
  163. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/options_consumer_spec.rb +45 -0
  164. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/enumerable/boolean_combinations_spec.rb +39 -0
  165. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/options_consumer_spec.rb +17 -0
  166. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/sym_keys_hash_spec.rb +13 -0
  167. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/console_speaker_spec.rb +13 -0
  168. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/listable_spec.rb +13 -0
  169. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/simple_cache_spec.rb +13 -0
  170. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/if_present_spec.rb +13 -0
  171. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec.rb +23 -0
  172. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec_files/path/my_stub_with_template +1 -0
  173. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/basename_sub_spec.rb +17 -0
  174. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/paths_hash_spec.rb +49 -0
  175. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec.rb +19 -0
  176. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_module_a.rb +6 -0
  177. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/require_sub_spec/stubbed_not_module.rb +6 -0
  178. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby_spec.rb +22 -0
  179. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb +46 -0
  180. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +102 -0
  181. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec.rb +35 -0
  182. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/expected_content +2 -0
  183. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/source.template +2 -0
  184. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec.rb +30 -0
  185. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file1.template +1 -0
  186. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file2 +1 -0
  187. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path2/subdir1/file3.template +1 -0
  188. data/vendor/gems/eac_ruby_utils/spec/lib/eac_ruby_utils/yaml_spec.rb +75 -0
  189. data/vendor/gems/eac_ruby_utils/spec/locales/pt-BR.yml +55 -0
  190. data/vendor/gems/eac_ruby_utils/spec/rubocop_check_spec.rb +7 -0
  191. data/vendor/gems/eac_ruby_utils/spec/spec_helper.rb +12 -0
  192. data/vendor/git-subrepo/Changes +51 -0
  193. data/vendor/git-subrepo/Intro.pod +508 -0
  194. data/vendor/git-subrepo/License +21 -0
  195. data/vendor/git-subrepo/Makefile +80 -0
  196. data/vendor/git-subrepo/Meta +28 -0
  197. data/vendor/git-subrepo/ReadMe.pod +695 -0
  198. data/vendor/git-subrepo/doc/comparison.swim +35 -0
  199. data/vendor/git-subrepo/doc/git-subrepo.swim +611 -0
  200. data/vendor/git-subrepo/doc/intro-to-subrepo.swim +387 -0
  201. data/vendor/git-subrepo/ext/bashplus/Changes +15 -0
  202. data/vendor/git-subrepo/ext/bashplus/License +21 -0
  203. data/vendor/git-subrepo/ext/bashplus/Makefile +45 -0
  204. data/vendor/git-subrepo/ext/bashplus/Meta +28 -0
  205. data/vendor/git-subrepo/ext/bashplus/ReadMe.pod +77 -0
  206. data/vendor/git-subrepo/ext/bashplus/bin/bash+ +43 -0
  207. data/vendor/git-subrepo/ext/bashplus/doc/bash+.swim +61 -0
  208. data/vendor/git-subrepo/ext/bashplus/lib/bash+.bash +92 -0
  209. data/vendor/git-subrepo/ext/bashplus/man/man1/bash+.1 +134 -0
  210. data/vendor/git-subrepo/ext/bashplus/man/man3/bash+.3 +134 -0
  211. data/vendor/git-subrepo/ext/bashplus/test/base.t +12 -0
  212. data/vendor/git-subrepo/ext/bashplus/test/fcopy.t +22 -0
  213. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/bar.bash +3 -0
  214. data/vendor/git-subrepo/ext/bashplus/test/lib/foo/foo.bash +3 -0
  215. data/vendor/git-subrepo/ext/bashplus/test/source-bash+-std.t +18 -0
  216. data/vendor/git-subrepo/ext/bashplus/test/source-bash+.t +23 -0
  217. data/vendor/git-subrepo/ext/bashplus/test/test.bash +70 -0
  218. data/vendor/git-subrepo/ext/bashplus/test/use.t +19 -0
  219. data/vendor/git-subrepo/ext/test-more-bash/Changes +15 -0
  220. data/vendor/git-subrepo/ext/test-more-bash/License +21 -0
  221. data/vendor/git-subrepo/ext/test-more-bash/Makefile +20 -0
  222. data/vendor/git-subrepo/ext/test-more-bash/Meta +30 -0
  223. data/vendor/git-subrepo/ext/test-more-bash/ReadMe.pod +115 -0
  224. data/vendor/git-subrepo/ext/test-more-bash/doc/test-more.swim +89 -0
  225. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Changes +15 -0
  226. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/License +21 -0
  227. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Makefile +45 -0
  228. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Meta +28 -0
  229. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/ReadMe.pod +77 -0
  230. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/bin/bash+ +43 -0
  231. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/doc/bash+.swim +61 -0
  232. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/lib/bash+.bash +92 -0
  233. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 +134 -0
  234. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 +134 -0
  235. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/base.t +12 -0
  236. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/fcopy.t +22 -0
  237. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/bar.bash +3 -0
  238. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/lib/foo/foo.bash +3 -0
  239. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t +18 -0
  240. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+.t +23 -0
  241. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/test.bash +70 -0
  242. data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/use.t +19 -0
  243. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Changes +15 -0
  244. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/License +21 -0
  245. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Makefile +37 -0
  246. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Meta +28 -0
  247. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod +66 -0
  248. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim +48 -0
  249. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash +153 -0
  250. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 +119 -0
  251. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t +13 -0
  252. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/done.t +10 -0
  253. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail.t +20 -0
  254. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t +15 -0
  255. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/helper.bash +9 -0
  256. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/pass.t +9 -0
  257. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/plan.t +10 -0
  258. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/skip_all.t +20 -0
  259. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/tap.t +13 -0
  260. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/bail.t +14 -0
  261. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail.t +7 -0
  262. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/fail_fast.t +12 -0
  263. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-init.t +8 -0
  264. data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-plan.t +9 -0
  265. data/vendor/git-subrepo/ext/test-more-bash/lib/test/more.bash +95 -0
  266. data/vendor/git-subrepo/ext/test-more-bash/man/man3/test-more.3 +173 -0
  267. data/vendor/git-subrepo/ext/test-more-bash/test/fail.t +20 -0
  268. data/vendor/git-subrepo/ext/test-more-bash/test/more.t +20 -0
  269. data/vendor/git-subrepo/ext/test-more-bash/test/pass.t +9 -0
  270. data/vendor/git-subrepo/ext/test-more-bash/test/setup +8 -0
  271. data/vendor/git-subrepo/ext/test-more-bash/test/skip_all.t +11 -0
  272. data/vendor/git-subrepo/ext/test-more-bash/test/test/fail1.t +12 -0
  273. data/vendor/git-subrepo/ext/test-more-bash/test/test/skip_all.t +10 -0
  274. data/vendor/git-subrepo/lib/git-subrepo +1891 -0
  275. data/vendor/git-subrepo/lib/git-subrepo.d/help-functions.bash +343 -0
  276. data/vendor/git-subrepo/man/man1/git-subrepo.1 +746 -0
  277. data/vendor/git-subrepo/note/0.4.0 +12 -0
  278. data/vendor/git-subrepo/note/AllGitCmds +148 -0
  279. data/vendor/git-subrepo/note/Cases +32 -0
  280. data/vendor/git-subrepo/note/Commands +33 -0
  281. data/vendor/git-subrepo/note/Dags +199 -0
  282. data/vendor/git-subrepo/note/Gists +7 -0
  283. data/vendor/git-subrepo/note/Links +25 -0
  284. data/vendor/git-subrepo/note/Plugins +10 -0
  285. data/vendor/git-subrepo/note/Spec +39 -0
  286. data/vendor/git-subrepo/note/Story1 +57 -0
  287. data/vendor/git-subrepo/note/ToDo +55 -0
  288. data/vendor/git-subrepo/note/design.swim +137 -0
  289. data/vendor/git-subrepo/note/design2.swim +85 -0
  290. data/vendor/git-subrepo/note/init-test +38 -0
  291. data/vendor/git-subrepo/note/pull-dance.txt +18 -0
  292. data/vendor/git-subrepo/note/recreate-rebase-conflict.sh +56 -0
  293. data/vendor/git-subrepo/note/subtree-rebase-fail-example/test.bash +29 -0
  294. data/vendor/git-subrepo/note/test-subrepo-push.sh +69 -0
  295. data/vendor/git-subrepo/note/test.sh +58 -0
  296. data/vendor/git-subrepo/pkg/bin/generate-completion.pl +210 -0
  297. data/vendor/git-subrepo/pkg/bin/generate-help-functions.pl +89 -0
  298. data/vendor/git-subrepo/share/completion.bash +42 -0
  299. data/vendor/git-subrepo/share/enable-completion.sh +50 -0
  300. data/vendor/git-subrepo/share/git-completion.bash +2738 -0
  301. data/vendor/git-subrepo/share/zsh-completion/_git-subrepo +82 -0
  302. data/vendor/git-subrepo/test/branch-all.t +41 -0
  303. data/vendor/git-subrepo/test/branch-rev-list-one-path.t +43 -0
  304. data/vendor/git-subrepo/test/branch-rev-list.t +47 -0
  305. data/vendor/git-subrepo/test/branch.t +52 -0
  306. data/vendor/git-subrepo/test/clean.t +43 -0
  307. data/vendor/git-subrepo/test/clone-annotated-tag.t +45 -0
  308. data/vendor/git-subrepo/test/clone.t +107 -0
  309. data/vendor/git-subrepo/test/compile.t +19 -0
  310. data/vendor/git-subrepo/test/config.t +58 -0
  311. data/vendor/git-subrepo/test/encode.t +91 -0
  312. data/vendor/git-subrepo/test/error.t +171 -0
  313. data/vendor/git-subrepo/test/fetch.t +43 -0
  314. data/vendor/git-subrepo/test/gitignore.t +61 -0
  315. data/vendor/git-subrepo/test/init.t +64 -0
  316. data/vendor/git-subrepo/test/issue29.t +98 -0
  317. data/vendor/git-subrepo/test/issue95.t +98 -0
  318. data/vendor/git-subrepo/test/issue96.t +96 -0
  319. data/vendor/git-subrepo/test/pull-all.t +38 -0
  320. data/vendor/git-subrepo/test/pull-merge.t +113 -0
  321. data/vendor/git-subrepo/test/pull-message.t +88 -0
  322. data/vendor/git-subrepo/test/pull-new-branch.t +58 -0
  323. data/vendor/git-subrepo/test/pull-ours.t +90 -0
  324. data/vendor/git-subrepo/test/pull-theirs.t +82 -0
  325. data/vendor/git-subrepo/test/pull-twice.t +44 -0
  326. data/vendor/git-subrepo/test/pull.t +99 -0
  327. data/vendor/git-subrepo/test/push-after-init.t +51 -0
  328. data/vendor/git-subrepo/test/push-force.t +56 -0
  329. data/vendor/git-subrepo/test/push-new-branch.t +61 -0
  330. data/vendor/git-subrepo/test/push-no-changes.t +29 -0
  331. data/vendor/git-subrepo/test/push-squash.t +56 -0
  332. data/vendor/git-subrepo/test/push.t +176 -0
  333. data/vendor/git-subrepo/test/reclone.t +45 -0
  334. data/vendor/git-subrepo/test/repo/bar/HEAD +1 -0
  335. data/vendor/git-subrepo/test/repo/bar/config +4 -0
  336. data/vendor/git-subrepo/test/repo/bar/objects/1f/0c4b264caed0126814a0ede851a1e0b4e16ae6 +0 -0
  337. data/vendor/git-subrepo/test/repo/bar/objects/87/46903fdb1b9c2101377880125917c2e05b4d69 +0 -0
  338. data/vendor/git-subrepo/test/repo/bar/objects/94/c86ffc745232d89f78c6f895e11e71272518db +0 -0
  339. data/vendor/git-subrepo/test/repo/bar/objects/c6/76c57b6576743fa56278527aa60ebd2e202a7c +0 -0
  340. data/vendor/git-subrepo/test/repo/bar/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  341. data/vendor/git-subrepo/test/repo/bar/objects/f6/2a8ff3feadf39b0a98f1a86ec6d1eb33858ee9 +0 -0
  342. data/vendor/git-subrepo/test/repo/bar/refs/heads/master +1 -0
  343. data/vendor/git-subrepo/test/repo/bar/refs/tags/A +1 -0
  344. data/vendor/git-subrepo/test/repo/foo/HEAD +1 -0
  345. data/vendor/git-subrepo/test/repo/foo/config +4 -0
  346. data/vendor/git-subrepo/test/repo/foo/objects/a0/f4cdaaf533a936296cdebbed8206c3b9ededa8 +0 -0
  347. data/vendor/git-subrepo/test/repo/foo/objects/e2/1291a1ad392a9d4c51dd9586804f1467b28afd +0 -0
  348. data/vendor/git-subrepo/test/repo/foo/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  349. data/vendor/git-subrepo/test/repo/foo/refs/heads/master +1 -0
  350. data/vendor/git-subrepo/test/repo/init/HEAD +1 -0
  351. data/vendor/git-subrepo/test/repo/init/config +5 -0
  352. data/vendor/git-subrepo/test/repo/init/objects/11/523f5dcf03b4c89b592dc8a3d0308f68da2386 +0 -0
  353. data/vendor/git-subrepo/test/repo/init/objects/14/2addf8ec5f37334e837440122c62f2c68a29ad +0 -0
  354. data/vendor/git-subrepo/test/repo/init/objects/32/5180321750a21cd7a4e7ecda319e557a4f6a09 +2 -0
  355. data/vendor/git-subrepo/test/repo/init/objects/3d/918c6901c02f43af5d31779dd5e1f9166aeb36 +0 -0
  356. data/vendor/git-subrepo/test/repo/init/objects/3e/4cb596066dce63ba4d047abddb677389b65e19 +0 -0
  357. data/vendor/git-subrepo/test/repo/init/objects/4b/6e53022e7a04f07887697e4f3d7c377fd9822b +0 -0
  358. data/vendor/git-subrepo/test/repo/init/objects/58/931fc1bd559b59c41ea738fc7ad04f9ad01bd3 +0 -0
  359. data/vendor/git-subrepo/test/repo/init/objects/5e/c0c28e1b806f25efdca18fcf7a74b49c3755bd +0 -0
  360. data/vendor/git-subrepo/test/repo/init/objects/75/fa6584e748f57eff06eebdc55e9ac21d4fcbf2 +1 -0
  361. data/vendor/git-subrepo/test/repo/init/objects/80/2d5edbd5e1cb7fca82b5bd38e7c8a0a496fb20 +0 -0
  362. data/vendor/git-subrepo/test/repo/init/objects/94/7b3d714c38791e95ad6f928b48c98bb8708acd +0 -0
  363. data/vendor/git-subrepo/test/repo/init/objects/95/e1f2df3f4d5f3d7a60588c25a7ca8a913d3c2a +1 -0
  364. data/vendor/git-subrepo/test/repo/init/objects/b1/5f4a7666baf40d949548ead946a3370e273479 +0 -0
  365. data/vendor/git-subrepo/test/repo/init/objects/c3/ee8978c4c5d84c3b7d00ba8e5906933d027882 +0 -0
  366. data/vendor/git-subrepo/test/repo/init/objects/c8/b0bffbc405ef3fad7354ff833fbec36d67ddfa +3 -0
  367. data/vendor/git-subrepo/test/repo/init/objects/dd/8bdb934ec848137f011fe423b185505c343626 +2 -0
  368. data/vendor/git-subrepo/test/repo/init/objects/e2/9be58c767cfeb27235c995d293a7d71aac0135 +2 -0
  369. data/vendor/git-subrepo/test/repo/init/objects/ee/1224401fc6aac595145fa727dcf6706ac8aec1 +1 -0
  370. data/vendor/git-subrepo/test/repo/init/objects/f1/cc1a657b2e805c400f5dcaaa76bd29c6178b1b +0 -0
  371. data/vendor/git-subrepo/test/repo/init/refs/heads/master +1 -0
  372. data/vendor/git-subrepo/test/setup +205 -0
  373. data/vendor/git-subrepo/test/status.t +68 -0
  374. data/vendor/git-subrepo/test/submodule.t +45 -0
  375. metadata +374 -14
  376. data/lib/avm/patches/eac_launcher_git_base.rb +0 -77
  377. data/lib/eac_launcher/git/base/_remotes.rb +0 -36
@@ -0,0 +1,12 @@
1
+ - Update docs
2
+ - Review issue/142
3
+ - Compare operations to master
4
+ - Add a --no-push or --dry-run flag for push
5
+ - Add a --rebase option for push
6
+ - Add --message= and --edit to the init command ??
7
+ - Also add to doc
8
+ - Update doc for steps of pull command to include merge and rebase
9
+ - Test squashing on pull operations
10
+ - Update push doc after understanding it more
11
+ - Is --rebase for pull or push?
12
+ - Make sure docs are correct too.
@@ -0,0 +1,148 @@
1
+ add
2
+ add--interactive
3
+ am
4
+ annotate
5
+ apply
6
+ archive
7
+ bisect
8
+ bisect--helper
9
+ blame
10
+ branch
11
+ bundle
12
+ cat-file
13
+ check-attr
14
+ check-ref-format
15
+ checkout
16
+ checkout-index
17
+ cherry
18
+ cherry-pick
19
+ clean
20
+ clone
21
+ commit
22
+ commit-tree
23
+ config
24
+ count-objects
25
+ credential-cache
26
+ credential-cache--daemon
27
+ credential-store
28
+ daemon
29
+ describe
30
+ diff
31
+ diff-files
32
+ diff-index
33
+ diff-tree
34
+ difftool
35
+ difftool--helper
36
+ fast-export
37
+ fast-import
38
+ fetch
39
+ fetch-pack
40
+ filter-branch
41
+ fmt-merge-msg
42
+ for-each-ref
43
+ format-patch
44
+ fsck
45
+ fsck-objects
46
+ gc
47
+ get-tar-commit-id
48
+ grep
49
+ hash-object
50
+ help
51
+ http-backend
52
+ http-fetch
53
+ http-push
54
+ hub
55
+ imap-send
56
+ index-pack
57
+ init
58
+ init-db
59
+ instaweb
60
+ log
61
+ lost-found
62
+ ls-files
63
+ ls-remote
64
+ ls-tree
65
+ mailinfo
66
+ mailsplit
67
+ merge
68
+ merge-base
69
+ merge-file
70
+ merge-index
71
+ merge-octopus
72
+ merge-one-file
73
+ merge-ours
74
+ merge-recursive
75
+ merge-resolve
76
+ merge-subtree
77
+ merge-tree
78
+ mergetool
79
+ mktag
80
+ mktree
81
+ mv
82
+ name-rev
83
+ notes
84
+ pack-objects
85
+ pack-redundant
86
+ pack-refs
87
+ patch-id
88
+ peek-remote
89
+ prune
90
+ prune-packed
91
+ pull
92
+ push
93
+ quiltimport
94
+ read-tree
95
+ rebase
96
+ receive-pack
97
+ reflog
98
+ relink
99
+ remote
100
+ remote-ext
101
+ remote-fd
102
+ remote-ftp
103
+ remote-ftps
104
+ remote-http
105
+ remote-https
106
+ remote-testgit
107
+ remove-submodule
108
+ repack
109
+ replace
110
+ repo-config
111
+ request-pull
112
+ rerere
113
+ reset
114
+ rev-list
115
+ rev-parse
116
+ revert
117
+ rm
118
+ send-pack
119
+ sh-i18n--envsubst
120
+ shell
121
+ shortlog
122
+ show
123
+ show-branch
124
+ show-index
125
+ show-ref
126
+ stage
127
+ stash
128
+ status
129
+ stripspace
130
+ submodule
131
+ subrepo
132
+ subtree
133
+ symbolic-ref
134
+ tag
135
+ tar-tree
136
+ unpack-file
137
+ unpack-objects
138
+ update-index
139
+ update-ref
140
+ update-server-info
141
+ upload-archive
142
+ upload-pack
143
+ var
144
+ verify-pack
145
+ verify-tag
146
+ web--browse
147
+ whatchanged
148
+ write-tree
@@ -0,0 +1,32 @@
1
+ == Users
2
+
3
+ - art — project lead
4
+ - bob — end user
5
+ - cab — collab dev (push rights)
6
+ - dim — forker dev (no push rights)
7
+ - ell — third party repo owner
8
+
9
+ == Repos
10
+ - art/gallery — art's main repo
11
+ - art/painting — subrepo owned by art
12
+ - ell/tickets — subrepo owned by ell
13
+
14
+ == Starting histories:
15
+ - art/gallery — A---B
16
+ - art/painting — P---Q
17
+ - ell/tickets — T
18
+
19
+ == Scenario 1
20
+ art art/gallery$ git log
21
+ A---B
22
+ art art/gallery$ git subrepo clone art/painting
23
+ art art/gallery$ ls
24
+ painting/
25
+ art art/gallery$ git log
26
+ A---B---C
27
+ /
28
+ Q'
29
+ art art/gallery$
30
+
31
+
32
+
@@ -0,0 +1,33 @@
1
+ $$$ for cmd in `cat AllGitCmds`; do git help $cmd; done
2
+
3
+
4
+ == Inteesting Plumbing Commands:
5
+ - git ls-tree HEAD
6
+ - git cat-file -t <object>
7
+ - git cat-file commit <commit>
8
+ - git cat-file -p <commit>
9
+ - git ls-tree <tree>
10
+ - git ls-files --stage
11
+ - git write-tree
12
+ - git update-ref refs/heads/master <commit>
13
+ - git symbolic-ref HEAD refs/heads/master
14
+ - git show-branch
15
+ - git hash-object <file>
16
+
17
+ - git rev-list --max-parents=0 HEAD — Find root commit
18
+ - git cherry — find commits in one branch that are not in another
19
+ - git replace
20
+
21
+ == Commands with DAG diagrams in their manpages:
22
+
23
+ - git-commit
24
+ - git-filter-branch
25
+ - git-log
26
+ - git-merge
27
+ - git-merge-base
28
+ - git-pull
29
+ - git-push
30
+ - git-rebase
31
+ - git-rerere
32
+ - git-rev-list
33
+ - git-rev-parse
@@ -0,0 +1,199 @@
1
+ == ASCII commmit DAG diagrams
2
+
3
+ D--E--F--G--H
4
+ / /
5
+ A--B-----C
6
+
7
+ .-A---M---N---O---P
8
+ / / / / /
9
+ I B C D E
10
+ \ / / / /
11
+ `-------------'
12
+
13
+ .-A---N---O
14
+ / / /
15
+ I---------D
16
+
17
+ .-A---M---N---O---P
18
+ / / / / /
19
+ I B / D /
20
+ \ / / / /
21
+ `-------------'
22
+
23
+ .-A---M---N---O
24
+ / / /
25
+ I B D
26
+ \ / /
27
+ `---------'
28
+
29
+ D---E-------F
30
+ / \ \
31
+ B---C---G---H---I---J
32
+ / \
33
+ A-------K---------------L--M
34
+
35
+ E-------F
36
+ \ \
37
+ G---H---I---J
38
+ \
39
+ L--M
40
+
41
+ A---B---C topic
42
+ /
43
+ D---E---F---G master
44
+
45
+
46
+ A---B---C topic
47
+ / \
48
+ D---E---F---G---H master
49
+
50
+ o---o---o---B
51
+ /
52
+ ---o---1---o---o---o---A
53
+
54
+ o---o---o---o---C
55
+ /
56
+ / o---o---o---B
57
+ / /
58
+ ---2---1---o---o---o---A
59
+
60
+ o---o---o---o---o
61
+ / \
62
+ / o---o---o---o---M
63
+ / /
64
+ ---2---1---o---o---o---A
65
+
66
+ ---1---o---A
67
+ \ /
68
+ X
69
+ / \
70
+ ---2---o---o---B
71
+
72
+ A---B---C master on origin
73
+ /
74
+ D---E---F---G master
75
+
76
+ A---B---C remotes/origin/master
77
+ / \
78
+ D---E---F---G---H master
79
+
80
+ B
81
+ /
82
+ ---X---A
83
+
84
+ B---C
85
+ / /
86
+ ---X---A
87
+
88
+ B D
89
+ / /
90
+ ---X---A
91
+
92
+ o---o---o---A---B origin/master
93
+ \
94
+ X---Y---Z dev
95
+
96
+ A---B (unnamed branch)
97
+ /
98
+ o---o---o---X---Y---Z master
99
+
100
+ A---B---C topic
101
+ /
102
+ D---E---F---G master
103
+
104
+ A'--B'--C' topic
105
+ /
106
+ D---E---F---G master
107
+
108
+ A---B---C topic
109
+ /
110
+ D---E---A'---F master
111
+
112
+ B'---C' topic
113
+ /
114
+ D---E---A'---F master
115
+
116
+ o---o---o---o---o master
117
+ | \
118
+ | o'--o'--o' topic
119
+ \
120
+ o---o---o---o---o next
121
+
122
+ H---I---J topicB
123
+ /
124
+ E---F---G topicA
125
+ /
126
+ A---B---C---D master
127
+
128
+ H'--I'--J' topicB
129
+ /
130
+ | E---F---G topicA
131
+ |/
132
+ A---B---C---D master
133
+
134
+ E---F---G---H---I---J topicA
135
+
136
+ E---H'---I'---J' topicA
137
+
138
+ X
139
+ \
140
+ A---M---B
141
+ /
142
+ ---o---O---P---Q
143
+
144
+ o---o---o---o---o---o---o---o---o master
145
+ \
146
+ o---o---o---o---o subsystem
147
+ \
148
+ *---*---* topic
149
+
150
+ o---o---o---o---o---o---o---o master
151
+ \ \
152
+ o---o---o---o---o o'--o'--o'--o'--o' subsystem
153
+ \
154
+ *---*---* topic
155
+
156
+ o---o---o---o---o---o---o---o master
157
+ \ \
158
+ o---o---o---o---o o'--o'--o'--o'--o'--M subsystem
159
+ \ /
160
+ *---*---*-..........-*--* topic
161
+
162
+ o---o---o---o---o---o---o---o master
163
+ \
164
+ o'--o'--o'--o'--o' subsystem
165
+ \
166
+ *---*---* topic
167
+ o---*---o topic
168
+ /
169
+ o---o---o---*---o---o master
170
+
171
+ o---*---o---+ topic
172
+ / /
173
+ o---o---o---*---o---o master
174
+
175
+ o---*---o---+---o---o topic
176
+ / / \
177
+ o---o---o---*---o---o---o---o---+ master
178
+
179
+ o---*---o-------o---o topic
180
+ /
181
+ o---o---o---*---o---o---o---o master
182
+
183
+ $ git rebase master topic
184
+
185
+ o---*---o-------o---o topic
186
+ /
187
+ o---o---o---*---o---o---o---o master
188
+
189
+ G H I J
190
+ \ / \ /
191
+ D E F
192
+ \ | / \
193
+ \ | / |
194
+ \|/ |
195
+ B C
196
+ \ /
197
+ \ /
198
+ A
199
+
@@ -0,0 +1,7 @@
1
+ - https://gist.github.com/kentfredric/9285653
2
+
3
+ - https://gist.github.com/anonymous/55bcf30acab99308714b
4
+ # a + b = o
5
+ - https://gist.github.com/anonymous/0544b465c57f01f8c4a6
6
+ - https://gist.github.com/ingydotnet/bf92949734b6a23f2af6
7
+ - https://gist.github.com/ingydotnet/a61b3cd1c422a17c6e5d
@@ -0,0 +1,25 @@
1
+ - http://stackoverflow.com/questions/1186535/how-to-modify-a-specified-commit/
2
+ - http://git-scm.com/book/en/Git-Tools-Rewriting-History
3
+ - http://git.661346.n2.nabble.com/Editing-the-root-commit-td7561714.html
4
+ - http://stackoverflow.com/questions/645450/git-how-to-insert-a-commit-as-the-first-shifting-all-the-others
5
+ - http://stackoverflow.com/questions/6149520/git-remove-root-commit ***
6
+ - http://fourkitchens.com/blog/2009/01/19/creating-common-branch-ancestry-hard-problem
7
+ - http://stackoverflow.com/questions/1488753/how-to-merge-two-branches-without-a-common-ancestor
8
+ - http://sahd.lamafam.org/?p=1534
9
+
10
+ - http://www.claassen.net/geek/blog/2011/02/git-merge-strategytheirs.html
11
+ - sahd.lamafam.org/?p=1534
12
+ - http://stackoverflow.com/questions/2945344/selecting-merge-strategy-options-for-git-rebase
13
+ - http://stackoverflow.com/questions/2428137/how-to-rebase-one-git-repository-onto-another-one
14
+ - http://stackoverflow.com/questions/3080509/git-list-commits-not-pushed-to-the-origin-yet
15
+ - http://stackoverflow.com/questions/2263674/how-do-i-find-the-next-commit-in-git
16
+
17
+ - http://git-scm.com/book/ch6-7.html (Subtree Merge)
18
+ - https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
19
+ - https://help.github.com/articles/working-with-subtree-merge
20
+ - git pull -s subtree foo master
21
+
22
+ - http://git-scm.com/2010/03/17/replace.html
23
+
24
+ - http://git.661346.n2.nabble.com/subtree-merges-lose-prefix-after-rebase-td7332850.html
25
+ - http://ruleant.blogspot.com/2013/06/git-subtree-module-with-gittrees-config.html