├── .gitignore ├── .rspec ├── .travis.yml ├── Gemfile ├── Gemfile.lock ├── LICENSE.txt ├── README.md ├── Rakefile ├── VERSION ├── bin ├── git-smart-log ├── git-smart-merge └── git-smart-pull ├── docs ├── images │ ├── git-smart.png │ ├── smart-log-comparison.png │ └── smart-pull-screenshot.png ├── introductory_blog_post.md ├── smart-log.html ├── smart-merge.html └── smart-pull.html ├── git-smart.gemspec ├── lib ├── commands │ ├── smart-log.rb │ ├── smart-merge.rb │ └── smart-pull.rb ├── core_ext │ ├── array.rb │ ├── hash.rb │ └── object.rb ├── git-smart.rb └── git-smart │ ├── exceptions.rb │ ├── execution_context.rb │ ├── git_repo.rb │ ├── git_smart.rb │ └── safe_shell.rb └── spec ├── smart-merge_failures_spec.rb ├── smart-merge_spec.rb ├── smart-pull_spec.rb └── spec_helper.rb /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/.gitignore -------------------------------------------------------------------------------- /.rspec: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/.rspec -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/.travis.yml -------------------------------------------------------------------------------- /Gemfile: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/Gemfile -------------------------------------------------------------------------------- /Gemfile.lock: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/Gemfile.lock -------------------------------------------------------------------------------- /LICENSE.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/LICENSE.txt -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/README.md -------------------------------------------------------------------------------- /Rakefile: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/Rakefile -------------------------------------------------------------------------------- /VERSION: -------------------------------------------------------------------------------- 1 | 0.1.10 2 | -------------------------------------------------------------------------------- /bin/git-smart-log: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/bin/git-smart-log -------------------------------------------------------------------------------- /bin/git-smart-merge: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/bin/git-smart-merge -------------------------------------------------------------------------------- /bin/git-smart-pull: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/bin/git-smart-pull -------------------------------------------------------------------------------- /docs/images/git-smart.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/docs/images/git-smart.png -------------------------------------------------------------------------------- /docs/images/smart-log-comparison.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/docs/images/smart-log-comparison.png -------------------------------------------------------------------------------- /docs/images/smart-pull-screenshot.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/docs/images/smart-pull-screenshot.png -------------------------------------------------------------------------------- /docs/introductory_blog_post.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/docs/introductory_blog_post.md -------------------------------------------------------------------------------- /docs/smart-log.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/docs/smart-log.html -------------------------------------------------------------------------------- /docs/smart-merge.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/docs/smart-merge.html -------------------------------------------------------------------------------- /docs/smart-pull.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/docs/smart-pull.html -------------------------------------------------------------------------------- /git-smart.gemspec: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/git-smart.gemspec -------------------------------------------------------------------------------- /lib/commands/smart-log.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/commands/smart-log.rb -------------------------------------------------------------------------------- /lib/commands/smart-merge.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/commands/smart-merge.rb -------------------------------------------------------------------------------- /lib/commands/smart-pull.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/commands/smart-pull.rb -------------------------------------------------------------------------------- /lib/core_ext/array.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/core_ext/array.rb -------------------------------------------------------------------------------- /lib/core_ext/hash.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/core_ext/hash.rb -------------------------------------------------------------------------------- /lib/core_ext/object.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/core_ext/object.rb -------------------------------------------------------------------------------- /lib/git-smart.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/git-smart.rb -------------------------------------------------------------------------------- /lib/git-smart/exceptions.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/git-smart/exceptions.rb -------------------------------------------------------------------------------- /lib/git-smart/execution_context.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/git-smart/execution_context.rb -------------------------------------------------------------------------------- /lib/git-smart/git_repo.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/git-smart/git_repo.rb -------------------------------------------------------------------------------- /lib/git-smart/git_smart.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/git-smart/git_smart.rb -------------------------------------------------------------------------------- /lib/git-smart/safe_shell.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/lib/git-smart/safe_shell.rb -------------------------------------------------------------------------------- /spec/smart-merge_failures_spec.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/spec/smart-merge_failures_spec.rb -------------------------------------------------------------------------------- /spec/smart-merge_spec.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/spec/smart-merge_spec.rb -------------------------------------------------------------------------------- /spec/smart-pull_spec.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/spec/smart-pull_spec.rb -------------------------------------------------------------------------------- /spec/spec_helper.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/geelen/git-smart/HEAD/spec/spec_helper.rb --------------------------------------------------------------------------------