├── .gitignore ├── .travis.yml ├── README.md ├── extension └── README.md ├── other ├── bad-history.png ├── clean-history.png └── rebase-and-merge.png ├── site ├── .babelrc ├── .editorconfig ├── .eslintignore ├── .eslintrc ├── .gitignore ├── README.md ├── index.html ├── karma.conf.js ├── other │ ├── deploy.sh │ └── devServer.js ├── package.json ├── src │ ├── App.js │ ├── colors.js │ └── index.js ├── webpack.config.dev.js └── webpack.config.prod.js └── webtask ├── README.md ├── index.js ├── index.test.js ├── package.json ├── rebase-and-merge.sh └── webpack.config.js /.gitignore: -------------------------------------------------------------------------------- 1 | node_modules 2 | *.ignored.* 3 | *.log 4 | -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/.travis.yml -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/README.md -------------------------------------------------------------------------------- /extension/README.md: -------------------------------------------------------------------------------- 1 | # rebase-and-merge Chrome Extension 2 | -------------------------------------------------------------------------------- /other/bad-history.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/other/bad-history.png -------------------------------------------------------------------------------- /other/clean-history.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/other/clean-history.png -------------------------------------------------------------------------------- /other/rebase-and-merge.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/other/rebase-and-merge.png -------------------------------------------------------------------------------- /site/.babelrc: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/.babelrc -------------------------------------------------------------------------------- /site/.editorconfig: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/.editorconfig -------------------------------------------------------------------------------- /site/.eslintignore: -------------------------------------------------------------------------------- 1 | node_modules 2 | coverage 3 | dist 4 | local-examples 5 | other 6 | -------------------------------------------------------------------------------- /site/.eslintrc: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/.eslintrc -------------------------------------------------------------------------------- /site/.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/.gitignore -------------------------------------------------------------------------------- /site/README.md: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /site/index.html: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/index.html -------------------------------------------------------------------------------- /site/karma.conf.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/karma.conf.js -------------------------------------------------------------------------------- /site/other/deploy.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/other/deploy.sh -------------------------------------------------------------------------------- /site/other/devServer.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/other/devServer.js -------------------------------------------------------------------------------- /site/package.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/package.json -------------------------------------------------------------------------------- /site/src/App.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/src/App.js -------------------------------------------------------------------------------- /site/src/colors.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/src/colors.js -------------------------------------------------------------------------------- /site/src/index.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/src/index.js -------------------------------------------------------------------------------- /site/webpack.config.dev.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/webpack.config.dev.js -------------------------------------------------------------------------------- /site/webpack.config.prod.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/site/webpack.config.prod.js -------------------------------------------------------------------------------- /webtask/README.md: -------------------------------------------------------------------------------- 1 | # rebase-and-merge Webtask 2 | -------------------------------------------------------------------------------- /webtask/index.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/webtask/index.js -------------------------------------------------------------------------------- /webtask/index.test.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/webtask/index.test.js -------------------------------------------------------------------------------- /webtask/package.json: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/webtask/package.json -------------------------------------------------------------------------------- /webtask/rebase-and-merge.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/webtask/rebase-and-merge.sh -------------------------------------------------------------------------------- /webtask/webpack.config.js: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/kentcdodds/rebase-and-merge/HEAD/webtask/webpack.config.js --------------------------------------------------------------------------------