search

susam / uncap

Map Caps Lock to Escape or any key to any key
MIT License
1.07k stars 44 forks source link

docs: fix simple typo, argments -> arguments #19

Closed timgates42 closed 3 years ago

timgates42 commented 3 years ago

There is a small typo in uncap.c.

Should read arguments rather than argments.

Semi-automated pull request generated by https://github.com/timgates42/meticulous/blob/master/docs/NOTE.md

susam commented 3 years ago

Hi @timgates42,

Thank you for creating this pull request. This pull request is changing all lines of code from Windows-style CRLF line-endings to Unix-style LF line-endings. It changes all 652 lines of code. I need the pull request to contain exactly one line of change and no changes in line-endings before I can merge this to master.

timgates42 commented 3 years ago

Thanks @susam fixed

susam commented 3 years ago

Thank you for updating the pull request. The previous commit with all 652 lines of code change still remains in this pull request. I want to avoid merging that commit. To fix this you would have to squash both the commits into a single commit with the following steps:

  1. Rebase the last two commits on the latest commit on master:

    git checkout bugfix_typo_arguments
git rebase -i e984df0

  2. When the editor comes up with a list of commits being rebased, in the second line change pick to squash. Then save and quit.

  3. When the editor comes up with the combined commit message, clean up the commit message. Then save and quit.

  4. Finally force push the branch to this pull request:

    git push -f origin bugfix_typo_arguments
timgates42 commented 3 years ago

Great instructions - thanks @susam - done now

susam commented 3 years ago

Merging this to master now. Thanks for the fix!