Merge branch 'summaries-in-slide-folders' into 'master'

Each summary in its own folder. Add Calendar.

Move Dec 9 description to own folder

What is a MR in its own folder

Add calendar

Add webcal link

Cleanup README a bit

Cleanup README a bit

Update

See merge request !2

README.md

-# Git It Together
-
+# Git It Together!
 'Git It Together' is a series of short, interactive workshops focused on using
-git as a tool for organized technical collaboration. This workshop meets most
-Thursdays at 9:00am in the JICS Auditorium (5100 RM 128), and is open to any
-ORNL staff, students, and visitors.
+git as a tool for organized technical collaboration.Each workshop will feature
+a short, interactive presentation, followed by an open Q&A session to answer
+any git questions you may have.
+
+## Time and Place
+This workshop meets most Thursdays at 9:00am in the JICS Auditorium
+(5100 RM 128), and is open to any ORNL staff, students, and visitors.
 
-Each workshop will feature a short, interactive presentation, followed by an
-open Q&A session to answer any git questions you may have. This workshop will
-largley cater to new git users, but we will occasionaly delve into advanced
-topics to help keep experts interested and keep everyone's skills sharp.
+### Put it on your Calendar!
+Outlook and iCal users can [subscribe to upcoming workshops](webcal://code.ornl.gov/git-it-together/meetings/raw/master/git-it-together.ics).
+
+## Who should come?
+The goal of this workshop is to spread adoption of git at ORNL, so we will
+largely focus on lowering the barrier of entry for new users. That being said,
+we want to keep it lively, so we will on occasion cover some of the wilder
+aspects of git.
 
 Folks who are already comfortable with git are strongly encouraged to attend and
 help answer questions, provide tips for new users, and to help advocate for
 expanding the adoption of git at ORNL.
 
-Join us and other ORNL git users on Slack: https://ornl.slack.com/messages/git/
+### Chat with other ORNL git users
+Curious about upcoming events? Have questions about git, or need to bounce an
+idea around? Join us and other ORNL git users on [Slack](https://ornl.slack.com/messages/git/).
 
 ## Workshop Topics
-Unless stated otherwise, these workshops are held on the following dates at
-9:00am in the JICS Auditorium (Building 5100 Room 128).
-
-* [Dec 22: What is a Merge Request?](#dec-22-what-is-a-merge-request)
-* [Dec 29: Branches for Fun and Profit](#dec-29-branches-for-fun-and-profit)
-* [Jan 5: Git-Flow -- The Standard Git Workflow](#jan-5-git-flow-the-standard-git-workflow)
-* [Jan 26: Continuous Integration with Gitlab Runners](#jan-26-continuous-integration-with-gitlab-runners)
-* [Feb 2: Desktop Clients for Git](#feb-2-desktop-clients-for-git)
-* [Feb 9: Using Remotes to Choose what you Share](#feb-9-using-remotes-to-choose-what-you-share)
-
+* [Dec 22: What is a Merge Request?](what-is-a-merge-request/)
+* [Dec 29: Branches for Fun and Profit](branches-for-fun-and-profit/)
+* [Jan 5: Git-Flow -- The Standard Git Workflow](git-flow-the-standard-git-workflow/)
+* [Jan 26: Continuous Integration with Gitlab Runners](continuous-integration-with-gitlab-runners/)
+* [Feb 2: Desktop Clients for Git](desktop-clients-for-git/)
+* [Feb 9: Using Remotes to Choose what you Share](using-remotes-to-choose-what-you-share/)
+
+### Suggest a Topic
 Have a suggestion for a topic, or want to volunteer to speak at one of the
 workshops? Just [open an issue](https://code.ornl.gov/git-it-together/meetings/issues)
 on this repo!
 
 ### Recent Workshops
-
-* [Dec 1: Using code.ornl.gov](#dec-1-using-codeornlgov) | [Slides](using-code-ornl-gov/)
-
-## Workshop Summaries
-
-### Dec 22: What is a Merge Request?
-**Thursday 12/22, 9:00am in JICS Auditorium (5100 RM 128)**
-
-Merge Requests are the core of collaboration in Gitlab. In this session, we'll 
-walk through creating a merge request for a shared project, and we'll talk about
-some of the issue that come up in accepting and vetting merge requests from
-external collaborators
-
-Offsite folks can join us via [BlueJeans](https://bluejeans.com/309751285).
-
-### Dec 29: Branches for Fun and Profit
-**Thursday 12/29, 9:00am in JICS Auditorium (5100 RM 128)**
-
-Branching is a central part of any version control system, and git's facilities
-for branching are second to none. In this workshop we will cover:
-
-* branching as a means of organized brainstorming
-* syncing branches with gitlab
-* Simple merging of local branches
-
-### Jan 5: Git-Flow -- The Standard Git Workflow
-**Thursday 1/5, 9:00am in JICS Auditorium (5100 RM 128)**
-
-One of git's greatest strengths is that it allows teams to design the
-collaboration workflow that works best for their needs. However, getting started
-from scratch can sometimes be daunting. This week we'll look at "Git-Flow", one
-of the most common workflow models. We'll discuss how it works, and how you can
-adapt it for your team's needs.
-
-### Jan 26: Continuous Integration with Gitlab Runners
-**Thursday 1/26, 9:00am in JICS Auditorium (5100 RM 128)**
-
-Continuous Integration is all the rage for producing high-quality software. 
-Gitlab provides a tool called "Runners" that allow you to automatically run your
-test suite every time new code is pushed. This makes it very easy to sanity
-check new Merge Requests before they get accepted -- this is a great (but not
-perfect) line of defense for keeping bugs out of your code.
-
-We'll talk about how to set up gitlab runners on your desktop, and define a 
-simple "pipeline" that tells Gitlab what to do when new code is pushed.
-
-### Feb 2: Desktop Clients for Git
-**Thursday 2/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
-towards what works best at ORNL.
-
-### Feb 9: Using Remotes to Choose what you Share
-**Thursday 2/9, 9:00am in JICS Auditorium (5100 RM 128)**
-
-Not all of us want to share every single change with the outside world. For
-some projects, it may be appropriate to maintain two repositories -- one for
-internal development, and one for publishing stable releases with the outside
-world.
-
-In this workshop, we'll go over a basic strategy for maintaing separate public
-and private copies of the same codebase. This will give us the opportunity to
-talk about:
-
-* Defining and connecting to remote repositories
-* Keeping branches in sync with different remotes
-* Using Gitlab's "Repository Sync" feature to automatically pull changes
-
-### Dec 1: Using code.ornl.gov
-**Thursday 12/1, 9:00am in JICS Auditorium (5100 RM 128)**
-
-This session will cover
-* accesssing code.ornl.gov using UCAMS or XCAMS
-* adding external collaborators to projects
-* setting up SSH keys for easy pushing and pulling.
- 
-We will also briefly walk through how to apply for an XCAMS account, so that you
-can show your non-ORNL colleagues how to sign up.
-
-[Slides from this meeting](using-code-ornl-gov/)
+* [Dec 1: Using code.ornl.gov](using-code-ornl-gov/)

branches-for-fun-and-profit/README.md

+# Dec 29: Branches for Fun and Profit
+**Thursday 12/29, 9:00am in JICS Auditorium (5100 RM 128)**
+
+Branching is a central part of any version control system, and git's facilities
+for branching are second to none. In this workshop we will cover:
+
+* branching as a means of organized brainstorming
+* syncing branches with gitlab
+* Simple merging of local branches

continuous-integration-with-gitlab-runners/README.md

+### Jan 26: Continuous Integration with Gitlab Runners
+**Thursday 1/26, 9:00am in JICS Auditorium (5100 RM 128)**
+
+Continuous Integration is all the rage for producing high-quality software. 
+Gitlab provides a tool called "Runners" that allow you to automatically run your
+test suite every time new code is pushed. This makes it very easy to sanity
+check new Merge Requests before they get accepted -- this is a great (but not
+perfect) line of defense for keeping bugs out of your code.
+
+We'll talk about how to set up gitlab runners on your desktop, and define a 
+simple "pipeline" that tells Gitlab what to do when new code is pushed.

desktop-clients-for-git/README.md

+### Feb 2: Desktop Clients for Git
+**Thursday 2/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
+towards what works best at ORNL.

git-flow-the-standard-git-workflow/README.md

+# Jan 5: Git-Flow -- The Standard Git Workflow
+**Thursday 1/5, 9:00am in JICS Auditorium (5100 RM 128)**
+
+One of git's greatest strengths is that it allows teams to design the
+collaboration workflow that works best for their needs. However, getting started
+from scratch can sometimes be daunting. This week we'll look at "Git-Flow", one
+of the most common workflow models. We'll discuss how it works, and how you can
+adapt it for your team's needs.

git-it-together.ics

+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//www.marudot.com//iCal Event Maker
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:America/New_York
+TZURL:http://tzurl.org/zoneinfo-outlook/America/New_York
+X-LIC-LOCATION:America/New_York
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19700308T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20161215T172216Z
+UID:20161215T172216Z-53861133@marudot.com
+DTSTART;TZID="America/New_York":20170202T090000
+DTEND;TZID="America/New_York":20170202T093000
+SUMMARY:GIT: Desktop Clients for Git
+LOCATION:5100 RM 128 (JICS Auditorium)
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20161215T172216Z
+UID:20161215T172216Z-825438685@marudot.com
+DTSTART;TZID="America/New_York":20170209T090000
+DTEND;TZID="America/New_York":20170209T093000
+SUMMARY:GIT: Using Remotes to Choose what you Share
+LOCATION:5100 RM 128 (JICS Auditorium)
+END:VEVENT
+END:VCALENDAR

using-code-ornl-gov/README.md

-# Accessing code.ornl.gov
+# Dec 1: Using code.ornl.gov
+**Thursday 12/1, 9:00am in JICS Auditorium (5100 RM 128)**
+
+This session will cover
+* accesssing code.ornl.gov using UCAMS or XCAMS
+* adding external collaborators to projects
+* setting up SSH keys for easy pushing and pulling.
+ 
+We will also briefly walk through how to apply for an XCAMS account, so that you
+can show your non-ORNL colleagues how to sign up.
+
+## Accessing code.ornl.gov
 
 You can access [code.ornl.gov](https://code.ornl.gov) with your UCAMS (three 
 letter login) or, if you are a non-ORNL collaborators, you may use your XCAMS 
@@ -27,4 +38,4 @@ they must first log in to [code.ornl.gov](https://code.ornl.gov) so that gitlab
 will recognize their UCAMS/XCAMS account. Once they have successfully logged in,
 you can add them by following the instructions here:
 
-https://docs.gitlab.com/ce/workflow/add-user/add-user.html#add-a-user
\ No newline at end of file
+https://docs.gitlab.com/ce/workflow/add-user/add-user.html#add-a-user

using-remotes-to-choose-what-you-share/README.md

+# Feb 9: Using Remotes to Choose what you Share
+**Thursday 2/9, 9:00am in JICS Auditorium (5100 RM 128)**
+
+Not all of us want to share every single change with the outside world. For
+some projects, it may be appropriate to maintain two repositories -- one for
+internal development, and one for publishing stable releases with the outside
+world.
+
+In this workshop, we'll go over a basic strategy for maintaing separate public
+and private copies of the same codebase. This will give us the opportunity to
+talk about:
+
+* Defining and connecting to remote repositories
+* Keeping branches in sync with different remotes
+* Using Gitlab's "Repository Sync" feature to automatically pull changes

what-is-a-merge-request/README.md

+# Dec 22: What is a Merge Request?
+**Thursday 12/22, 9:00am in JICS Auditorium (5100 RM 128)**
+
+Merge Requests are the core of collaboration in Gitlab. In this session, we'll 
+walk through creating a merge request for a shared project, and we'll talk about
+some of the issue that come up in accepting and vetting merge requests from
+external collaborators
+
+Offsite folks can join us via [BlueJeans](https://bluejeans.com/309751285).
+
+