diff --git a/basics.html b/basics.html
index 5781cea614047efb129792e2d01e4d1ea82ae2a3..d41475e9db22617f0a94f63685a0b5732739a187 100644
--- a/basics.html
+++ b/basics.html
@@ -358,8 +358,11 @@
 
             notes:
             - learn by doing / understand what you do
-            - gui hides too much of that
-            - use gui if gui helps workflow
+            - 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)
+              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
           </section>
 
           <section id="cli-description" data-markdown>
@@ -525,6 +528,8 @@
             - **prepare** commit adding more and more **changes**
             - **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
           </section>
 
           <section id="cli-git-files" data-markdown>