Update from original

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/Dockerfile

@@ -0,0 +1,8 @@
+FROM ubuntu:latest
+RUN apt update -y
+RUN apt install zsh git -y
+COPY . /tmp/git-katas
+WORKDIR /tmp/git-katas
+ENV SHELL /bin/zsh
+ENTRYPOINT [ "zsh" ,"-c" ]
+CMD ["source testzsh.sh"]

.github/workflows/publish.yml

@@ -0,0 +1,42 @@
+name: Publish
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Get tag
+      id: get_tag
+      run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//}
+
+    - name: Archive katas
+      shell: bash
+      run: git archive --output=git-katas.zip HEAD
+
+    - name: Create GitHub release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        draft: false
+        prerelease: false
+
+    - name: Attach katas
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./git-katas.zip
+        asset_name: git-katas-${{ steps.get_tag.outputs.TAG }}.zip
+        asset_content_type: application/zip

.github/workflows/test.yml

@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  setup-bash:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Run bash test scripts
+      shell: bash
+      run: |
+        chmod +x ./test.sh
+        ./test.sh
+
+  setup-bash-macos:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Run bash test scripts
+      shell: bash
+      run: |
+        chmod +x ./test.sh
+        ./test.sh
+
+  setup-pwsh:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Run PowerShell Core test scripts
+      run: ./test.ps1
+      shell: pwsh
+
+  setup-zsh:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build Zsh image
+      run: docker build -t zshell -f .github/Dockerfile .
+    - name: running zsh test
+      run: docker run zshell

.gitignore

@@ -1,3 +1,5 @@
-*~
-*.swp
-**/exercise
+git_attributes
+*~
+*.swp
+**/exercise
+**/remote

3-way-merge/README.md

@@ -2,23 +2,21 @@
 
 ## Setup
 
-1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
+1. Run `source setup.sh` (or `.\setup.ps1` in PowerShell)
 
 ## The task
 You again live in your own branch, this time we will be doing a bit of juggling with branches, to show how lightweight branches are in git.
 
 1. Create a branch called greeting and check it out
-1. Edit the greeting.txt to contain your favorite greeting
-1. Add greeting.txt files to staging area using patch mode (`-p`)
-1. Commit
-1. Switch back to the master branch
-1. Create a file README.md with information about this repository
-1. Try adding README.md file to staging area using patch mode (it wont work)
-1. What is the output of `git status`?
-1. Add the README.md file to staging area and make the commit
-1. What is the output of `git log --oneline --graph --all`?
-1. Diff the branches
-1. Merge the greeting branch into master
+2. Edit the greeting.txt to contain your favorite greeting
+3. Add greeting.txt files to the staging area
+4. Commit
+5. Switch back to the master branch
+6. Create a file README.md with information about this repository
+7. Add the README.md file to staging area and make the commit
+8. What is the output of `git log --oneline --graph --all`?
+9. Diff the branches
+10. Merge the greeting branch into master
 
 ## Useful commands
 - `git branch`
@@ -28,7 +26,6 @@ You again live in your own branch, this time we will be doing a bit of juggling
 - `git checkout -b <branch-name>`
 - `git branch -v`
 - `git add`
-- `git add -p`
 - `git commit`
 - `git commit -m`
 - `git merge <branchA> <branchB>`

3-way-merge/setup.sh

@@ -4,7 +4,7 @@
 source ../utils/utils.sh
 
 kata="3-way-merge"
-makerepo
+make-exercise-repo
 
 touch greeting.txt
 git add greeting.txt

Overview.md

@@ -1,73 +1,46 @@
-# Overview of Git Katas
-
-
-## [Bad-commit](bad-commit/README.md)
-Cleaning up a bit.
-
-## [basic-commits](basic-commits/README.md)
-Very basic creation of commits.
-
-## [basic-staging](basic-staging/README.md)
-interacting with the stage (index).
-
-## [basic-branching](basic-branching/README.md)
-The first stride into branching.
-
-## [basic-cleaning](basic-cleaning/README.md)
-Cleaning the workspace.
-
-## [ignore](ignore/README.md)
-The basics of using the `.gitignore` file.
-
-## [commit-on-wrong-branch](commit-on-wrong-branch/README.md)
-An administrative exercise, how do we _move_ a commit that we accidentially put on the wrong branch.
-
-## [commit-on-wrong-branch-2](commit-on-wrong-branch-2/README.md)
-Another exercise on what to do if you have accidentially committed
-on the wrong branch.
-
-## [ff-merge](ff-merge/README.md)
-A tour around the most trivial of merges.
-
-## [3-way-merge](3-way-merge/README.md)
-A basic merge, involving multiple diverged branches.
-
-## [merge-conflict](merge-conflict/README.md)
-A basic merge between diverging branches with incompatible changesets.
-
-## [merge-mergesort](merge-mergesort/README.md)
-A merge confligt with actual code.
-
-## [reverted-merge](reverted-merge/README.md)
-A merge has to be reverted, but this causes problems.
-
-## [rebase-branch](rebase-branch/README.md)
-Using rebase as an alternative to merging.
-
-## [pre-push](pre-push/README.md)
-A quick exercise in using Git hooks.
-
-## [reorder-the-history](reorder-the-history/README.md)
-We might have created our commits in a suboptimal order, practice to fix that scenario here.
-
-## [reset](reset/README.md)
-Reset is a powerful and slightly dangerous command if you do not know what you are doing.
-Go trough the three modes of resetting here.
-
-## [basic-stashing](basic-stashing/README.md)
-The first stride into stashing.
-
-## [save-my-commit](save-my-commit/README.md)
-Should you accidentially or on purpose delete a commit, go here to try and save it.
-
-## [squashing](squashing/README.md)
-A lot of small commits is good when you are working locally, but for sharing your code, it might be more beneficial to deliver your code changes in large sets. Go here to experiment with that.
-
-## [submodules](submodules/README.md)
-Submodules are loathed by many. Run through this exercise to see what the ruckus is all about.
-
-## [Investigation](investigation/README.md)
-Discover what is going on in a Git repo, figure out what it looks like under the hood.
-
-## [Objects](objects/README.md)
-A small exercise into Git internals.
+# Overview of the Git Kata Exercises
+
+## Setup
+
+1. [configure-git](configure-git/README.md) - If git is not configured, some basic configuration steps
+
+## Basic Git Katas in Suggested Order
+
+1. [basic-commits](basic-commits/README.md) - Very basic creation of commits.
+2. [basic-staging](basic-staging/README.md) - Interacting with the stage (index).
+3. [basic-branching](basic-branching/README.md) - The first stride into branching.
+4. [ff-merge](ff-merge/README.md) - A tour around the most trivial of merges.
+5. [3-way-merge](3-way-merge/README.md) - A basic merge, involving multiple diverged branches.
+6. [merge-conflict](merge-conflict/README.md) - A basic merge between diverging branches with incompatible (but simple) changesets.
+7. [merge-mergesort](merge-mergesort/README.md) - A merge conflict with actual code.
+8. [rebase-branch](rebase-branch/README.md) - Using rebase as an alternative to merging.
+9. [basic-revert](basic-revert/README.md) - Use revert to revert a change
+10. [reset](reset/README.md) - Reset is a powerful and slightly dangerous command if you do not know what you are doing. Go through the three modes of resetting here.
+11. [basic-cleaning](basic-cleaning/README.md) - Cleaning the workspace.
+12. [amend](amend/README.md) - Amending previous commits.
+13. [reorder-the-history](reorder-the-history/README.md) - We might have created our commits in a suboptimal order, practice to fix that scenario here.
+14. [squashing](squashing/README.md) - A lot of small commits is good when you are working locally, but for sharing your code, it might be more beneficial to deliver your code changes in large sets. Go here to experiment with that. Write a good commit
+15. [advanced-rebase-interactive](advanced-rebase-interactive/README.md) - Practice using the interactive rebase commands.
+16. [basic-stashing](basic-stashing/README.md) - The first stride into stashing.
+17. [ignore](ignore/README.md) - The basics of using the `.gitignore` file. And using `git rm`.
+18. [submodules](submodules/README.md) - Submodules are loathed by many. Run through this exercise to see what the ruckus is all about.
+19. [git-tag](git-tag//README.md) - Tags are convenient for keeping track of commits that bump a version number. In this exercise, you will list, add and delete tags.
+
+## Katas that solve standard problems
+
+1. [commit-on-wrong-branch](commit-on-wrong-branch/README.md) - If we accidentally put unpushed commits on the wrong branch, how do we effectively _move_ them to another branch before our work on that branch.
+2. [commit-on-wrong-branch-2](commit-on-wrong-branch-2/README.md) - Another exercise on what to do if you have accidentally committed on the wrong branch.
+3. [reverted-merge](reverted-merge/README.md) - We revert a merge, but, after fixes are added to the merged branch, we want the changes from merge and the new fixes.
+4. [save-my-commit](save-my-commit/README.md) - Should you accidentally or on purpose delete a commit, go here to try and save it. You will use the reflog.
+5. [detached-head](detached-head/README.md) - git complains that you are in a "You are in 'detached HEAD' state". What do you do?
+
+## Katas On Advanced features
+
+1. [git-attributes](git-attributes/README.md) - .gitattributes file allows you to specify how git handles files, such as line endings in text files or how to diff a binary file.
+2. [Bad-commit](bad-commit/README.md) - Using `git bisect` to find a bad commit.
+3. [bisect](bisect/README.md) - Another kata using `git bisect`.
+4. [pre-push](pre-push/README.md) - A quick exercise in using Git hooks.
+5. [Investigation](investigation/README.md) - Discover what is going on in a Git repo, figure out what it looks like under the hood.
+6. [Objects](objects/README.md) - A small exercise into Git internals.
+7. [merge-driver](merge-driver/README.md) - Defining a custom merge driver.
+8. [rebase-exec](rebase-exec/README.md) - Run tests on every commit using `git rebase --exec`