Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct all the typo of . setup.sh to ./setup.sh #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3-way-merge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./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.
Expand Down
2 changes: 1 addition & 1 deletion advanced-rebase-interactive/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ As this is an advanced exercise, there are no specific steps to follow and no si

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion amend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Sometimes we just forget something obvious that we want to fix quickly.

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task
1. What does `git status` tell us?
Expand Down
2 changes: 1 addition & 1 deletion bad-commit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Find the commit and revert it using bisect.

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Useful commands

Expand Down
2 changes: 1 addition & 1 deletion basic-branching/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Git Kata: Basic Branching
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./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.
Expand Down
2 changes: 1 addition & 1 deletion basic-cleaning/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task
You are working on a project that involves generated files. Say you are compiling C files into object files. Before checking out a new branch you want to start clean
Expand Down
2 changes: 1 addition & 1 deletion basic-revert/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Git Kata: Basic revert
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion basic-staging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We will also work with `git reset` to reset the staged changes of a file, and `g

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
1 change: 1 addition & 0 deletions basic-staging/file.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
56
2 changes: 1 addition & 1 deletion basic-stashing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion bisect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ ./test.sh
```
## Setup:

1. Run `. setup.sh`
1. Run `./setup.sh`

## Tasks

Expand Down
2 changes: 1 addition & 1 deletion commit-on-wrong-branch-2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ the `master` branch instead of the feature branch.

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
4 changes: 2 additions & 2 deletions commit-on-wrong-branch/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# gitkatas
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Kata 5: Commit on wrong branch
This kata was shameless ripped off from [Git Katas](http://blog.schauderhaft.de/gitkata/)

You are working really hard on the master branch.
You are working really hard on the master branch.
Part of your work is already committed. This is when your boss comes in with an urgent request.

Since your current HEAD is not ready for prime time you backup one commit, and start a new branch named 'quickfix'. You do whatever your boss wants and commit the changes to that new branch.
Expand Down
4 changes: 2 additions & 2 deletions detached-head/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Detached head state

Expand All @@ -20,4 +20,4 @@ Note that this task might seem more confusing if you did not run `setup.sh` in y

We want to have a branch called `the-beginning` that is made from the first commit with message `A`

How would you do this?
How would you do this?
2 changes: 1 addition & 1 deletion ff-merge/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Git Kata: Fast-forward Merge
## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion ignore/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ If you want to signal to git that a file needs to be removed from git, but still

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion investigation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Objects are stored in `<repository>/.git/objects` in subfolders matching the fir

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion merge-conflict/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion merge-driver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ We'll do this by setting up `merge-tst-files.sh` as a _merge driver_ for `.tst`

## Setup:

1. Run `. setup.sh`
1. Run `./setup.sh`

## The task

Expand Down
2 changes: 1 addition & 1 deletion merge-mergesort/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The task is to look at the merge conflict, and solve it by editing the file acco

## Setup:

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

Expand Down
2 changes: 1 addition & 1 deletion rebase-branch/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Git Kata: rebase branch

## Setup:
1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)


## The task
Expand Down
2 changes: 1 addition & 1 deletion rebase-exec/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion reorder-the-history/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ You should fix this such that our `git log` looks great!

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
2 changes: 1 addition & 1 deletion reset/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ We use reset to unstage change, but we can also do many more different things.

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Task
1. How does your working directory look like?
Expand Down
6 changes: 3 additions & 3 deletions reverted-merge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ production, you decide to revert the merge commit.

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## The task

* Revert the merge commit
* Revert the merge commit
*Note: You may assume that feature Y is also working with the old library version*
* Take the role of the library team and fix the bug in the library on the branch
* Explore how you can get the changes from the branch into the master again
* Explore how you can get the changes from the branch into the master again
Try to merge first to see what happens

For in depth discussion of some the the issues that can happen when reverting a merge commit consult this gist:
Expand Down
4 changes: 2 additions & 2 deletions save-my-commit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Save it!

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

# Task
1. Save the most important commit that was lost
1. What's the difference between saving using reset and using cherry-pick?
1. Remove the `exercise` folder.
1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `git gc`
1. Can you still save the lost commit?
1. For extra credit what if someone reset their branch, force pushed and you pulled? Can you restore the old state?
Expand Down
2 changes: 1 addition & 1 deletion squashing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ While you are at it I would really like the ugly `\n` characters inside `file.tx

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

## Task

Expand Down
4 changes: 2 additions & 2 deletions submodules/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ This allows you to grab source change directly, as well as _pushing_ them back.

## Setup

1. Run `. setup.sh` (or `.\setup.ps1` in PowerShell)
1. Run `./setup.sh` (or `.\setup.ps1` in PowerShell)

> NOTE: If running setup.sh on windows, you can run into problems by sourcing the setup script. Instead, run `./setup.sh`, and the folders would be created correctly.

## Task

After running `. setup.sh` or `. ./setup.sh`, you'll be left with two repositories inside the `exercises` folder.
After running `./setup.sh` or `. ./setup.sh`, you'll be left with two repositories inside the `exercises` folder.

* A `product` repository
* A `component` repository.
Expand Down