├── .gitattributes ├── .gitignore ├── 3-way-merge ├── README.md ├── setup.ps1 └── setup.sh ├── LICENSE.txt ├── Overview.md ├── README.md ├── SHELL-BASICS.md ├── advanced-rebase-interactive ├── README.md ├── setup.ps1 └── setup.sh ├── amend ├── README.md ├── setup.ps1 └── setup.sh ├── bad-commit ├── README.md ├── setup.ps1 └── setup.sh ├── basic-branching ├── README.md ├── setup.ps1 └── setup.sh ├── basic-cleaning ├── README.md ├── setup.ps1 └── setup.sh ├── basic-commits ├── README.md ├── setup.ps1 └── setup.sh ├── basic-revert ├── README.md ├── setup.ps1 └── setup.sh ├── basic-staging ├── README.md ├── setup.ps1 └── setup.sh ├── basic-stashing ├── README.md ├── setup.ps1 └── setup.sh ├── bisect ├── README.md ├── setup.sh └── verify.sh ├── commit-on-wrong-branch-2 ├── README.md ├── setup.ps1 └── setup.sh ├── commit-on-wrong-branch ├── README.md ├── setup.ps1 └── setup.sh ├── configure-git └── README.md ├── detached-head ├── README.md ├── setup.ps1 └── setup.sh ├── docs ├── README.md └── _config.yml ├── ff-merge ├── README.md ├── setup.ps1 └── setup.sh ├── ignore ├── README.md ├── setup.ps1 └── setup.sh ├── images └── quickstart.gif ├── investigation ├── README.md ├── setup.ps1 └── setup.sh ├── merge-conflict ├── README.md ├── setup.ps1 └── setup.sh ├── merge-driver ├── README.md └── setup.sh ├── merge-mergesort ├── README.md ├── base.py ├── lefty.py ├── righty.py ├── setup.ps1 └── setup.sh ├── objects └── README.md ├── pre-push ├── README.md └── pre-push ├── rebase-branch ├── README.md ├── setup.ps1 └── setup.sh ├── rebase-exec ├── README.md ├── setup.sh └── verify.sh ├── reorder-the-history ├── README.md ├── setup.ps1 └── setup.sh ├── reset ├── README.md ├── setup.ps1 └── setup.sh ├── reverted-merge ├── README.md ├── setup.ps1 └── setup.sh ├── save-my-commit ├── README.md ├── setup.ps1 └── setup.sh ├── squashing ├── README.md ├── setup.ps1 └── setup.sh ├── submodules ├── README.md ├── setup.ps1 └── setup.sh ├── test.ps1 ├── test.sh ├── trainer-notes.md └── utils ├── clone-remote-to-exercise.sh ├── make-exercise-repo.ps1 ├── make-exercise-repo.sh ├── make-fake-remote.sh ├── resources └── merge-tst-files.sh └── utils.sh /.gitattributes: -------------------------------------------------------------------------------- 1 | * text=auto eol=lf 2 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/.gitignore -------------------------------------------------------------------------------- /3-way-merge/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/3-way-merge/README.md -------------------------------------------------------------------------------- /3-way-merge/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/3-way-merge/setup.ps1 -------------------------------------------------------------------------------- /3-way-merge/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/3-way-merge/setup.sh -------------------------------------------------------------------------------- /LICENSE.txt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/LICENSE.txt -------------------------------------------------------------------------------- /Overview.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/Overview.md -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/README.md -------------------------------------------------------------------------------- /SHELL-BASICS.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/SHELL-BASICS.md -------------------------------------------------------------------------------- /advanced-rebase-interactive/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/advanced-rebase-interactive/README.md -------------------------------------------------------------------------------- /advanced-rebase-interactive/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/advanced-rebase-interactive/setup.ps1 -------------------------------------------------------------------------------- /advanced-rebase-interactive/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/advanced-rebase-interactive/setup.sh -------------------------------------------------------------------------------- /amend/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/amend/README.md -------------------------------------------------------------------------------- /amend/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/amend/setup.ps1 -------------------------------------------------------------------------------- /amend/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/amend/setup.sh -------------------------------------------------------------------------------- /bad-commit/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/bad-commit/README.md -------------------------------------------------------------------------------- /bad-commit/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/bad-commit/setup.ps1 -------------------------------------------------------------------------------- /bad-commit/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/bad-commit/setup.sh -------------------------------------------------------------------------------- /basic-branching/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-branching/README.md -------------------------------------------------------------------------------- /basic-branching/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-branching/setup.ps1 -------------------------------------------------------------------------------- /basic-branching/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-branching/setup.sh -------------------------------------------------------------------------------- /basic-cleaning/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-cleaning/README.md -------------------------------------------------------------------------------- /basic-cleaning/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-cleaning/setup.ps1 -------------------------------------------------------------------------------- /basic-cleaning/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-cleaning/setup.sh -------------------------------------------------------------------------------- /basic-commits/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-commits/README.md -------------------------------------------------------------------------------- /basic-commits/setup.ps1: -------------------------------------------------------------------------------- 1 | . ..\utils\make-exercise-repo.ps1 2 | -------------------------------------------------------------------------------- /basic-commits/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-commits/setup.sh -------------------------------------------------------------------------------- /basic-revert/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-revert/README.md -------------------------------------------------------------------------------- /basic-revert/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-revert/setup.ps1 -------------------------------------------------------------------------------- /basic-revert/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-revert/setup.sh -------------------------------------------------------------------------------- /basic-staging/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-staging/README.md -------------------------------------------------------------------------------- /basic-staging/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-staging/setup.ps1 -------------------------------------------------------------------------------- /basic-staging/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-staging/setup.sh -------------------------------------------------------------------------------- /basic-stashing/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-stashing/README.md -------------------------------------------------------------------------------- /basic-stashing/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-stashing/setup.ps1 -------------------------------------------------------------------------------- /basic-stashing/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/basic-stashing/setup.sh -------------------------------------------------------------------------------- /bisect/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/bisect/README.md -------------------------------------------------------------------------------- /bisect/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/bisect/setup.sh -------------------------------------------------------------------------------- /bisect/verify.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/bisect/verify.sh -------------------------------------------------------------------------------- /commit-on-wrong-branch-2/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/commit-on-wrong-branch-2/README.md -------------------------------------------------------------------------------- /commit-on-wrong-branch-2/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/commit-on-wrong-branch-2/setup.ps1 -------------------------------------------------------------------------------- /commit-on-wrong-branch-2/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/commit-on-wrong-branch-2/setup.sh -------------------------------------------------------------------------------- /commit-on-wrong-branch/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/commit-on-wrong-branch/README.md -------------------------------------------------------------------------------- /commit-on-wrong-branch/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/commit-on-wrong-branch/setup.ps1 -------------------------------------------------------------------------------- /commit-on-wrong-branch/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/commit-on-wrong-branch/setup.sh -------------------------------------------------------------------------------- /configure-git/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/configure-git/README.md -------------------------------------------------------------------------------- /detached-head/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/detached-head/README.md -------------------------------------------------------------------------------- /detached-head/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/detached-head/setup.ps1 -------------------------------------------------------------------------------- /detached-head/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/detached-head/setup.sh -------------------------------------------------------------------------------- /docs/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/docs/README.md -------------------------------------------------------------------------------- /docs/_config.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/docs/_config.yml -------------------------------------------------------------------------------- /ff-merge/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/ff-merge/README.md -------------------------------------------------------------------------------- /ff-merge/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/ff-merge/setup.ps1 -------------------------------------------------------------------------------- /ff-merge/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/ff-merge/setup.sh -------------------------------------------------------------------------------- /ignore/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/ignore/README.md -------------------------------------------------------------------------------- /ignore/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/ignore/setup.ps1 -------------------------------------------------------------------------------- /ignore/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/ignore/setup.sh -------------------------------------------------------------------------------- /images/quickstart.gif: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/images/quickstart.gif -------------------------------------------------------------------------------- /investigation/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/investigation/README.md -------------------------------------------------------------------------------- /investigation/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/investigation/setup.ps1 -------------------------------------------------------------------------------- /investigation/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/investigation/setup.sh -------------------------------------------------------------------------------- /merge-conflict/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-conflict/README.md -------------------------------------------------------------------------------- /merge-conflict/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-conflict/setup.ps1 -------------------------------------------------------------------------------- /merge-conflict/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-conflict/setup.sh -------------------------------------------------------------------------------- /merge-driver/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-driver/README.md -------------------------------------------------------------------------------- /merge-driver/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-driver/setup.sh -------------------------------------------------------------------------------- /merge-mergesort/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-mergesort/README.md -------------------------------------------------------------------------------- /merge-mergesort/base.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-mergesort/base.py -------------------------------------------------------------------------------- /merge-mergesort/lefty.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-mergesort/lefty.py -------------------------------------------------------------------------------- /merge-mergesort/righty.py: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-mergesort/righty.py -------------------------------------------------------------------------------- /merge-mergesort/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-mergesort/setup.ps1 -------------------------------------------------------------------------------- /merge-mergesort/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/merge-mergesort/setup.sh -------------------------------------------------------------------------------- /objects/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/objects/README.md -------------------------------------------------------------------------------- /pre-push/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/pre-push/README.md -------------------------------------------------------------------------------- /pre-push/pre-push: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/pre-push/pre-push -------------------------------------------------------------------------------- /rebase-branch/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/rebase-branch/README.md -------------------------------------------------------------------------------- /rebase-branch/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/rebase-branch/setup.ps1 -------------------------------------------------------------------------------- /rebase-branch/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/rebase-branch/setup.sh -------------------------------------------------------------------------------- /rebase-exec/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/rebase-exec/README.md -------------------------------------------------------------------------------- /rebase-exec/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/rebase-exec/setup.sh -------------------------------------------------------------------------------- /rebase-exec/verify.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/rebase-exec/verify.sh -------------------------------------------------------------------------------- /reorder-the-history/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reorder-the-history/README.md -------------------------------------------------------------------------------- /reorder-the-history/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reorder-the-history/setup.ps1 -------------------------------------------------------------------------------- /reorder-the-history/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reorder-the-history/setup.sh -------------------------------------------------------------------------------- /reset/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reset/README.md -------------------------------------------------------------------------------- /reset/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reset/setup.ps1 -------------------------------------------------------------------------------- /reset/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reset/setup.sh -------------------------------------------------------------------------------- /reverted-merge/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reverted-merge/README.md -------------------------------------------------------------------------------- /reverted-merge/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reverted-merge/setup.ps1 -------------------------------------------------------------------------------- /reverted-merge/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/reverted-merge/setup.sh -------------------------------------------------------------------------------- /save-my-commit/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/save-my-commit/README.md -------------------------------------------------------------------------------- /save-my-commit/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/save-my-commit/setup.ps1 -------------------------------------------------------------------------------- /save-my-commit/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/save-my-commit/setup.sh -------------------------------------------------------------------------------- /squashing/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/squashing/README.md -------------------------------------------------------------------------------- /squashing/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/squashing/setup.ps1 -------------------------------------------------------------------------------- /squashing/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/squashing/setup.sh -------------------------------------------------------------------------------- /submodules/README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/submodules/README.md -------------------------------------------------------------------------------- /submodules/setup.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/submodules/setup.ps1 -------------------------------------------------------------------------------- /submodules/setup.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/submodules/setup.sh -------------------------------------------------------------------------------- /test.ps1: -------------------------------------------------------------------------------- 1 | cd basic-commits 2 | .\setup.ps1 3 | cd .. -------------------------------------------------------------------------------- /test.sh: -------------------------------------------------------------------------------- 1 | cd basic-commits 2 | ./setup.sh 3 | cd .. -------------------------------------------------------------------------------- /trainer-notes.md: -------------------------------------------------------------------------------- 1 | Add notes for trainer here. 2 | -------------------------------------------------------------------------------- /utils/clone-remote-to-exercise.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/utils/clone-remote-to-exercise.sh -------------------------------------------------------------------------------- /utils/make-exercise-repo.ps1: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/utils/make-exercise-repo.ps1 -------------------------------------------------------------------------------- /utils/make-exercise-repo.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/utils/make-exercise-repo.sh -------------------------------------------------------------------------------- /utils/make-fake-remote.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/utils/make-fake-remote.sh -------------------------------------------------------------------------------- /utils/resources/merge-tst-files.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/utils/resources/merge-tst-files.sh -------------------------------------------------------------------------------- /utils/utils.sh: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/VernitaJ/git-katas/HEAD/utils/utils.sh --------------------------------------------------------------------------------