Merge branch 'staging-area' into 'master'

Staging Area Feb 2, Desktop Clients Mar 2

See merge request !7

README.md

@@ -29,10 +29,11 @@ idea around? Join us and other ORNL git users on [Slack](https://ornl.slack.com/
 
 ## Workshop Topics
 * [Jan 26: Continuous Integration with Gitlab Runners](continuous-integration-with-gitlab-runners/)
-* [Feb 2: Desktop Clients for Git](desktop-clients-for-git/)
+* [Feb 2: The Staging Area -- Understanding what gets Committed](staging-area-understanding-what-gets-committed/)
 * [Feb 9: Using Remotes to Choose what you Share](using-remotes-to-choose-what-you-share/)
 * [Feb 16: What is a Merge Request?](what-is-a-merge-request/)
 * [Feb 23: Don't Panic -- Gitting unlost](dont-panic-gitting-unlost/)
+* [Mar 2: Desktop Clients for Git](desktop-clients-for-git/)
 
 ### Git Involved!
 Have a suggestion for a topic, or want to volunteer to speak at one of the

desktop-clients-for-git/README.md

-### Feb 2: Desktop Clients for Git
-**Thursday 2/2, 9:00am in JICS Auditorium (5100 RM 128)**
+### Mar 2: Desktop Clients for Git
+**Thursday 3/2, 9:00am in JICS Auditorium (5100 RM 128)**
 **Speaker: Bruce Wilson**
 
 A Comparison of popular Desktop Clients for Mac and Windows, with a special eye

staging-area-understanding-what-gets-committed/README.md

+### Feb 2: The Staging Area -- Understanding what gets Committed
+**Thursday 2/2, 9:00am in JICS Auditorium (5100 RM 128)**
+**Speaker: Matt Belhorn**
+
+Git expects content to be moved to a special state called the "staging area"
+before it can be committed. Understanding the differences between what is
+in the staging area and what you see on disk can sometimes be tricky for new
+users. In this talk, we show how to use the staging area to control what gets
+committed and what does not.