diff --git a/basics.html b/basics.html index 121376d93d675051ee62a1841cc3b582bf2863d7..b53c575944a541860482d60ee0bb10b3ce48d623 100644 --- a/basics.html +++ b/basics.html @@ -192,7 +192,7 @@ notes: - - there's a rule in ~~open source software~~ nay life + - there is a rule in ~~open source software~~ nay life - if you want the world to be a better place - complain about it (issue tracker) - if you are able to fix it: do it! @@ -202,7 +202,7 @@ ## motivation #3 ### collaboration made easy - <!-- do not fix this typo, it's here on purpose to show collab --> + <!-- do not fix this typo, it is here on purpose to show collab --> > This text cntains a typo. notes: @@ -255,8 +255,8 @@ notes: - software, thats obvious - blog / doc: web-pages in general are more and more managed by git - - e.g. this git cheat sheet we're handing out is a git repo - - if it doesn't support version control, i.e. text, don't use it, + - e.g. this git cheat sheet we are handing out is a git repo + - if it does not support version control, i.e. text, do not use it, e.g. graphics written in dot, compiled to SVG </section> @@ -325,9 +325,9 @@ - **Windows:** [git bash](https://git-scm.com/download/win) notes: - - **Windows Subsystem for Linux (WSL)**: we don't use it because it - can't use native Windows editors - - **cmder**: we've tried it, it sucks + - **Windows Subsystem for Linux (WSL)**: we do not use it because + it cannot use native Windows editors + - **cmder**: we have tried it, it sucks </section> <section id="install-your-turn" data-markdown> @@ -357,9 +357,9 @@ - learn by doing / understand what you do - GUI hides too much of that - use GUI only if it integrates well in your workflow, e.g. IDE - - my main editor is emacs, so I'm using emacs integration (magit) + - my main editor is emacs, so I am using emacs integration (magit) for most of my day-to-day tasks, only a few key presses per git - operation, when I'm in the terminal, I simply use the CLI + operation, when I am in the terminal, I simply use the CLI </section> <section id="cli-description" data-markdown> @@ -532,7 +532,7 @@ - important git command - shows a lot of information - shows basic git commands - - later, we'll see different outputs + - later, we will see different outputs </section> <section id="internals-staging-area" data-markdown> @@ -541,7 +541,7 @@  notes: - - **don't demo here! that's done during next slide, this one is + - **do not demo here! that is done during next slide, this one is about the concept of the staging area** - **call for attention, this is important** - in a local git repository, content can be in three stages @@ -550,7 +550,8 @@ - **commit** this **set of changes** - commit **should be a logical unit** of changes - the deciding feature of a git (G)UI is how it handles the stage, - i.e. if you can't interactively stage/unstage hunks, the UI sucks + i.e. if you cannot interactively stage/unstage hunks, the UI + sucks </section> <section id="cli-git-files" data-markdown> @@ -619,7 +620,7 @@ and to the point. The body may explain in more detail why this change was introduced. - - don't list which files changed + - do not list which files changed - the diff already tells that References to issue trackers should be in the very end, e.g.: @@ -772,7 +773,7 @@ note: - show both commands in web interface when creating new repository - explain HTTPS and SSH URLs - - for seminar, we'll stick to HTTPS + - for seminar, we will stick to HTTPS - you can set up password manager integration later, git integrates well with the common ones </section> @@ -801,9 +802,9 @@ # branch and merge notes: - - this is a demo chapter, you'll all do this in collaboration + - this is a demo chapter, you will all do this in collaboration chapter (next one) - - what was this **master** again? we haven't explained yet + - what was this **master** again? we have not explained yet </section> <section id="branch-visual" data-markdown> @@ -833,7 +834,7 @@ - comment out code notes: - - if logical commit without breaking don't branch + - if logical commit without breaking do not branch </section> <section id="branch-commands" data-markdown> @@ -1020,7 +1021,7 @@ ## you can now - create and connect to remotes - - contribute to projects you don't own + - contribute to projects you do not own - maintain projects you own </section>