summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Wed, 23 Oct 2013 19:44:40 +0000 (12:44 -0700)]
Merge branch 'master' into namespaced
This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch. After this merge, future
merges from the master branch will pick up any content changes.
$ git merge --log --no-ff --strategy ours master
* master:
README.md: Remove nesting version-control/git
W. Trevor King [Wed, 23 Oct 2013 12:04:02 +0000 (05:04 -0700)]
README.md: Remove nesting version-control/git
There's no need to hard-code target directories in this repository.
Anyone consuming this material can use submodules and pick their own
target directory.
W. Trevor King [Mon, 24 Jun 2013 14:16:19 +0000 (10:16 -0400)]
version-control/git/README.md: Add paragraph pitching Git
Why should you use this tool?
W. Trevor King [Mon, 10 Jun 2013 19:13:07 +0000 (15:13 -0400)]
version-control/git: Use git-and-github notes
Consolidate on these instructor notes because they are already in a
condensed format. Remove the long-form local/remote READMEs, whose
content should be merged into the instructor guide. Flesh out the
cheat sheet with additional commands mentioned in the new instructor
notes.
W. Trevor King [Mon, 10 Jun 2013 16:54:29 +0000 (12:54 -0400)]
version-control/git/cheet-sheet.md: Add a Git-specific cheat sheet
Matt Davis [Fri, 22 Feb 2013 22:03:42 +0000 (17:03 -0500)]
Instructor notes for teaching git via collaboration on GitHub.
The focus of the lesson is to have students contribute to a repo on GitHub in
which we are building up a list of the things they are most interested in
learning at the boot camp. Requires everyone have a good internet connection
and that at least some of the participants sign up for GitHub.