From 263b1cfcf6527fe186f0cfb155b784a99ecb698e Mon Sep 17 00:00:00 2001 From: Tim Berglund Date: Thu, 31 Oct 2013 16:14:41 -0600 Subject: [PATCH] SparkFun notes --- .../2013-10-30-sparkfun-lunch-and-learn.md | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 classnotes/2013-10-30-sparkfun-lunch-and-learn.md diff --git a/classnotes/2013-10-30-sparkfun-lunch-and-learn.md b/classnotes/2013-10-30-sparkfun-lunch-and-learn.md new file mode 100644 index 00000000..e0e90a4f --- /dev/null +++ b/classnotes/2013-10-30-sparkfun-lunch-and-learn.md @@ -0,0 +1,99 @@ +--- +layout: bare +title: SparkFun Lunch and Learn +description: SparkFun Lunch and Learn Class Notes +tags: [notes] +path: classnotes/2013-10-30-sparkfun-lunch-and-learn.md +eventdate: 2013-10-30 +--- + +## Teachers +* Tim Berglund ([Twitter](http://twitter.com/tlberglund), [GitHub](https://github.com/tlberglund)) + +## Resources + +* [Adding SSL Certificates for GitHub.com (Common for Windows XP)](http://stackoverflow.com/questions/3777075/https-github-access/4454754#4454754) +* Disabling SSL Certificate Checks for Git: + + git config --global http.sslVerify false +* [Open Source Git Ignore Templates](https://github.com/github/gitignore) +* [Book Authoring on Git and GitHub](http://teach.github.com/articles/book-authoring-using-git-and-github/) +* [Post Receive Hooks](https://help.github.com/articles/post-receive-hooks) +* [GitHub Training Videos](http://training.github.com/resources/videos/) +* [Using Git with Media Temple](http://carl-topham.com/theblog/post/using-git-media-temple/) +* [GitHub Training Feedback and Follow-up Questions](https://github.com/githubtraining/feedback/issues?state=open) +* [GitHub Commit Status API for Continuous Integration](https://github.com/blog/1227-commit-status-api) +* [Git Credential Cache for HTTP](http://teach.github.com/articles/lesson-git-credential-cache/) +* [GitHub Issues Cheatsheet](http://teach.github.com/articles/github-issues-cheatsheet/) +* [Jenkins Git Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin) +* [Open Source Git Ignores](https://github.com/github/gitignore) +* [Ship of Theseus - Related to Similarity Index](http://en.wikipedia.org/wiki/Ship_of_Theseus) +* [git-p4 Perforce Script](http://answers.perforce.com/articles/KB_Article/Git-P4) +* [Unix watch command](http://en.wikipedia.org/wiki/Watch_(Unix\)) +* [SHA-1 Hash Collisions](http://git-scm.com/book/ch6-1.html#A-SHORT-NOTE-ABOUT-SHA-1) +* [NPD Git Cheatsheet](http://ndpsoftware.com/git-cheatsheet.html) +* [More Git Cheatsheets](http://teach.github.com/articles/git-cheatsheets/) + +## Installation +* Git Installation + * [The Git-SCM Web Site (All Platforms)](http://git-scm.com) + * [The GitHub for Windows Client and Command Line](http://windows.github.com) +* Minimum is 1.7.ANYTHING, but can have issues with HTTPS credential prompting. +* Best is 1.8.0 or higher + +## Suggested Books, Articles +* [Free ProGit Book](http://git-scm.com/book) +* [Getting started with Version Control](http://teach.github.com/articles/lesson-new-to-version-control/) +* [The GitHub Flow](http://scottchacon.com/2011/08/31/github-flow.html) +* [DVCS Workflows Book](https://github.com/zkessin/dvcs-workflows) +* [Git Cheat Sheets](http://teach.github.com/articles/git-cheatsheets/) +* [Git Workflow Links](https://pinboard.in/u:matthew.mccullough/t:git+workflow) + +## Course Materials, Links +* [Git Teaching Materials](http://teach.github.com) +* [Course Slides](http://teach.github.com/presentations/) +* [Course Slides Source](https://github.com/github/teach.github.com/tree/gh-pages/presentations) +* [Post-event Git and GitHub questions](https://github.com/githubtraining/feedback/) +* [Free Office Hours Sessions](http://training.github.com/web/free-classes/) + +## Outline + +* What even is a GitHub? +* Continuous Integration with PRs +* How to tag commits via the Windows GUI + * IDK if you can even do this +* Submodules + * This is way too hard for today but hey we can talk about it some + * Also, hey, subtrees? +* LICENSE.txt + * choosealicense.com +* Pull Requests + + +## Command History + git init sparkfun + cd sparkfun + pwd + git diff + git commit -m "Initial commit" + git status + git add raven.txt + git commit -m "Nearly napping" + git remote add origin https://github.com/githubteacher/sparkfun.git + git push -u origin master + git log + git help log + git fetch + ls + vi raven.txt + git add . + git commit -m "Someone rapping" + git tag DEMO_TAG + git pull + git tag DEMO_TAG_2 + git lol + git push origin DEMO_TAG + vi .git/config + git push + cat .git/config +