From 2f31d9a8e1c7a1b992222e660faa5223133f0295 Mon Sep 17 00:00:00 2001 From: fran496 <franciscorivas496@gmail.com> Date: Sun, 24 Mar 2019 11:33:23 -0400 Subject: [PATCH 1/2] Add Francisco Rivas to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a9b0674544..0058550f75 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) -- GitLab From 0a3edcd3293df47019a2ea5f6d422ae94edd4e9f Mon Sep 17 00:00:00 2001 From: fran496 <franciscorivas496@gmail.com> Date: Sun, 24 Mar 2019 11:37:47 -0400 Subject: [PATCH 2/2] Fixing a typo, is blablabla not blablablabla --- additional-material/git_workflow_scenarios/squashing-commits.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/additional-material/git_workflow_scenarios/squashing-commits.md b/additional-material/git_workflow_scenarios/squashing-commits.md index b31cc3b04e..21eb2acffa 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 -- GitLab