diff --git a/Contributors.md b/Contributors.md index a9b067454485f230b1095f88773a8ff0f6d4744e..0058550f75373f81816f3018de026ab0aab0c490 100755 --- a/Contributors.md +++ b/Contributors.md @@ -78,6 +78,7 @@ Srinivas Pudu - [kalbernaz](https://github.com/kalbernaz11) - [Jordan396](https://github.com/Jordan396) - [Keyiyi](github.com/keyiyi) +Francisco Rivas - [Syl Wang](https://github.com/XiuW) - [Kumar Saurabh](https://github.com/saurabh1969) - [Carsen Rapp](https://github.com/carsenrapp) diff --git a/additional-material/git_workflow_scenarios/squashing-commits.md b/additional-material/git_workflow_scenarios/squashing-commits.md index b31cc3b04edc73e4940fcd8740dbccababc9c154..21eb2acffac7865a2d9ebd7dc45ca82bbc8aa7a0 100644 --- a/additional-material/git_workflow_scenarios/squashing-commits.md +++ b/additional-material/git_workflow_scenarios/squashing-commits.md @@ -61,7 +61,7 @@ pick blablabla2 Adding dummy01.txt file # Note that empty commits are commented out ``` -So if you want to squash ```blablabla2``` into ```blablablabla```, you would change the following : +So if you want to squash ```blablabla2``` into ```blablabla```, you would change the following : ``` pick blablabla Changing test01.txt file