Permalink
Switch branches/tags
Nothing to show
Commits on Mar 22, 2013
  1. Replace incorrect information about HEAD

    aschrab committed Mar 20, 2013
    Avoid stating that changing HEAD alters the working tree.  Although that
    is a common next step they are not actually the same action and can be
    done independently (e.g. `git reset` without `--hard`).
    
    Also state that committing while on a branch only alters the branch,
    without actually changing HEAD; HEAD only gets the new commit because it
    points to the branch rather than a specific commit.
  2. Use relative URL for ?NODEMO

    aschrab committed Mar 22, 2013
    Change the NODEMO link to use a relative URL so that clicking the URL in
    a development build will remain in that development build rather than
    going to the main site.
  3. Swap parents of final commit in intro/3 level goal

    aschrab committed Mar 22, 2013
    Change the order of parents of the final commit in the goal of the level
    intro/3 to match the history produced by the expected solution. Although
    either order is accepted the new, consistent order of parents is the
    more idiomatic one merging a bugFix into master rather than master into
    bugFix. Actually producing the old goal would require more commands.
    
    Even though ordering of parents is too advanced of a topic to be covered
    this early, it would be nice to keep that consistent.
Commits on Mar 20, 2013
  1. Don't refer to grandparent commit as second parent

    aschrab committed Mar 20, 2013
    The term "second parent" has a specific meaning in git that is distinct
    from a grandparent, so avoid referring to a grandparent (~2) as a second
    parent (^2).
Commits on Feb 21, 2013
  1. No multiple arguments for merge

    aschrab committed Feb 21, 2013
    `git merge` should only be given multiple arguments if doing an octopus
    merge which isn't currently supported.  Require that exactly one
    argument be given, and always use HEAD as the currentLocation.
  2. Target branch can't be second argument to merge

    aschrab committed Feb 21, 2013
    Remove instances in tutorial where the target branch for a merge is
    supplied as a second argument to `git merge`.  The target branch for
    merge is always the current branch.
Commits on Feb 20, 2013
  1. Add levels symlink at top level

    aschrab committed Feb 20, 2013
    Without this link running `grunt build` gives me errors like:
    
        Running "browserify:build/bundle.js" (browserify) task
        Fatal error: Cannot find module: "../../levels/intro/1" from directory "/home/ats/vc/learnGitBranching/src/levels" while processing file /home/ats/vc/learnGitBranching/src/levels/index.js
  2. Fix path to levels from level arbiter

    aschrab committed Feb 20, 2013
    Need to go up to directories from the level arbiter to get to the
    directory containing level definitions.
  3. Fix capitalization of sandboxCommands file

    aschrab committed Feb 20, 2013
    On case-sensitive file systems, need to use correct case in require()
    calls.
  4. Remove obsolete numBackFrom method

    aschrab committed Feb 20, 2013
    The numBackFrom method is no longer called from anywhere with the
    changes from the previous commit to change how relative references are
    handled.
  5. Improve parsing of relative references

    aschrab committed Feb 20, 2013
    Support parsing of references like HEAD~^2~3^ .  Previously, ~ required
    a following number, ^ didn't allow a following number, and chaining
    wasn't supported.
    
    If at any point in the resolving of the chain the requested parent isn't
    found report the error by specifying the id of the last commit that was
    found along with the parent specification to help the user to figure out
    where the problem arose.
  6. Add getParent method for Commit objects

    aschrab committed Feb 20, 2013
    Add method to retrieve a given parent (not ancestor) of a commit object.
    If the commit doesn't have the requested parent return null.
  7. Add .editorconfig file

    aschrab committed Feb 20, 2013
    Create a file to provide code formatting hints to editors with support
    for the [EditorConfig][] format.
    
     [EditorConfig]: http://editorconfig.org/