1. 24 Jan, 2015 3 commits
  2. 28 Sep, 2014 1 commit
  3. 11 Sep, 2014 8 commits
  4. 10 Sep, 2014 6 commits
    • Git for Teams's avatar
      Lesson 6: Added a new lesson for merging · d27b4aba
      Git for Teams authored
      It doesn't make sense to leave merging until later in the series.
      Incorporating lessons here for:
      - fetch + merge vs. pull
      - merging with --no-ff to force a true merge (and add a commit)
      - default merge strategy (fast forward if possible) which re-aligns the
        commits as if they'd always been in place, and does not force a new
        commit message (there is a commit message if a fast forward isn't
    • Git for Teams's avatar
      Lesson 8: Enhancing notes for git stash · e5683daf
      Git for Teams authored
      The notes were insufficient for this lesson, so I've fixed them. You
      need to include the commit hash for an example commit that's bad
      (broken) and an example commit that's working (good). If you don't
      specify a "bad" commit id, Git will assume that the latest commit for
      is "bad". It's better if you can be explicit with both in case there's
      something funky going on.
    • Git for Teams's avatar
    • Git for Teams's avatar
      Lesson 8: expanding descriptions · bc101c8d
      Git for Teams authored
      - Finding Relative History with Git Log
      - Finding the Last Working State with Bisect
      - Finding the History of a File with Blame
      - Using Stash to Work on an Emergency Bug Fix
    • Git for Teams's avatar
      Lesson 7: Expanding notes on tags · 396bde1d
      Git for Teams authored
      Lessons are now as follows:
      - Listing, Adding, and Deleting Tags
      - Checking Out Tags
      - Recovering from a Detached HEAD State
      - Sharing Tags
    • Git for Teams's avatar
      Lesson 6: Branching. Expanded descriptions. · 542adf09
      Git for Teams authored
      - Listing all branches; updating the list of branches wwith fetch
      - Using a different branch; setting up tracking
      - Establishing your branching strategy (Scheduled Deployment; CD)
      - Creating a Topic Branch
      - Pushing your changes to the remote repository and verifying your work
        was uploaded
  5. 09 Sep, 2014 4 commits
  6. 08 Sep, 2014 2 commits
  7. 07 Sep, 2014 5 commits
  8. 05 Sep, 2014 1 commit
  9. 04 Sep, 2014 1 commit
  10. 02 Sep, 2014 1 commit
    • Emma Jane's avatar
      Adding stub descriptions for video lessons from O'Reilly outline · 6d8d4ce4
      Emma Jane authored
      1. Introduction
         Warm-up exercise
      2. Getting Started
         Using GitLab
      3. Downloading a Remote Repository
         Using clone
      4. Getting Started as a Team of One
         Using init, add
      5. Connecting to Remote Repositories
         Different ways to (re)connect files
      6. Working with Branches
         One-issue-per-branch workflow
      7. Working with Tags
         Dealing with detached head state
      8. Finding and Fixing Bugs
         Using log, bisect, blame, stash
      9. Rollbacks, Resets, and Undoing Your Work
         Amend, Checkout, Reset, Revert
         Rebase, Rerere
      11.Collaborating on GitHub
         Fork, Web UI, Issues, Pull Request
      12.Collaborating on BitBucket
         Fork, Issues, Merge Requests