another_project.git
10 years agoAdd AI source "flat look" diagrams
jordanmccullough [Sat, 21 Sep 2013 15:27:49 +0000 (09:27 -0600)]
Add AI source "flat look" diagrams

10 years agoMerge pull request #205 from danielribeiro/branch-note
Matthew McCullough [Sat, 21 Sep 2013 15:08:49 +0000 (08:08 -0700)]
Merge pull request #205 from danielribeiro/branch-note

documenting how to show all branches, but sorted by date

10 years agodocumenting how to show all branches, but sorted by date, with the respective dates...
Daniel Ribeiro [Sat, 21 Sep 2013 06:45:15 +0000 (23:45 -0700)]
documenting how to show all branches, but sorted by date, with the respective dates as well

10 years agoUpdate Merge fast-forward diagram with flat look
jordanmccullough [Sat, 21 Sep 2013 00:39:08 +0000 (18:39 -0600)]
Update Merge fast-forward diagram with flat look

10 years agoUpdate Merge recursive diagram with flat look
jordanmccullough [Fri, 20 Sep 2013 19:30:03 +0000 (13:30 -0600)]
Update Merge recursive diagram with flat look

10 years agoFix diagram fragment styling, cleanup, and alignment correction
jordanmccullough [Fri, 20 Sep 2013 19:48:12 +0000 (13:48 -0600)]
Fix diagram fragment styling, cleanup, and alignment correction

10 years agoClass notes for advanced private Git class
Matthew McCullough [Fri, 20 Sep 2013 15:21:25 +0000 (09:21 -0600)]
Class notes for advanced private Git class

10 years agoRemove day-two outline from day-one foundations class notes
Matthew McCullough [Fri, 20 Sep 2013 14:51:25 +0000 (10:51 -0400)]
Remove day-two outline from day-one foundations class notes

10 years agoMove Octocat watermark to upper left
jordanmccullough [Thu, 19 Sep 2013 17:35:55 +0000 (11:35 -0600)]
Move Octocat watermark to upper left

Prevents opaque diagrams from cover branding and only partially showing.

10 years agoFix fragment diagram absolute positioning
jordanmccullough [Thu, 19 Sep 2013 17:29:15 +0000 (11:29 -0600)]
Fix fragment diagram absolute positioning

Accounts for center alignment and parent width of 95%

10 years agoMerge branch 'gh-pages' of github.com:github/teach.github.com into gh-pages
Matthew McCullough [Wed, 18 Sep 2013 12:00:49 +0000 (08:00 -0400)]
Merge branch 'gh-pages' of github.com:github/teach.github.com into gh-pages

Conflicts:
classnotes/2013-09-10-advanced-git-at-javazone.md

10 years ago2013-09-17 private foundations class notes
Matthew McCullough [Wed, 18 Sep 2013 11:57:24 +0000 (07:57 -0400)]
2013-09-17 private foundations class notes

10 years agoCorrected advanced->foundations in title
Matthew McCullough [Wed, 18 Sep 2013 11:57:12 +0000 (07:57 -0400)]
Corrected advanced->foundations in title

10 years agoMerge pull request #201 from randomecho/copyedit-classnotes-javazone-20130910
Matthew McCullough [Sat, 14 Sep 2013 23:51:04 +0000 (16:51 -0700)]
Merge pull request #201 from randomecho/copyedit-classnotes-javazone-20130910

Copyedit on Private Advanced Git Training at JavaZone

10 years agoMerge pull request #203 from github/h4-margin-fix
Jordan McCullough [Sat, 14 Sep 2013 23:13:14 +0000 (16:13 -0700)]
Merge pull request #203 from github/h4-margin-fix

Update header style padding to fix alignment

10 years agoUpdate header style padding to fix alignment
jordanmccullough [Fri, 13 Sep 2013 18:28:42 +0000 (12:28 -0600)]
Update header style padding to fix alignment

Include h4 padding definition same as h3 to avoid on-the-edge heading
titles.

10 years agoCopyedit on Private Advanced Git Training at JavaZone
Soon Van [Fri, 13 Sep 2013 16:58:04 +0000 (12:58 -0400)]
Copyedit on Private Advanced Git Training at JavaZone

- Added "at JavaZone" to help differentiate in listing
- Signed Tags, Bisect could do with a step up to H3
- Forgoing bare URLs for linked words, for web aesthetic
- Bullets in Audience Requirements feels like H2 time
- Last Required bullet point may not be required

10 years agoCommand line history for JavaZone
Matthew McCullough [Tue, 10 Sep 2013 21:26:07 +0000 (23:26 +0200)]
Command line history for JavaZone

10 years agoProgramutvikling Workshop
Tim Berglund [Tue, 10 Sep 2013 14:24:22 +0000 (16:24 +0200)]
Programutvikling Workshop

10 years agoFirst draft of JavaZone notes
Matthew McCullough [Tue, 10 Sep 2013 10:37:43 +0000 (12:37 +0200)]
First draft of JavaZone notes

10 years agoRemoved extraneous 't' found by @randomecho
Matthew McCullough [Sun, 8 Sep 2013 14:21:49 +0000 (08:21 -0600)]
Removed extraneous 't' found by @randomecho

10 years agoMerge pull request #187 from github/theme-font-diag-fix
Matthew McCullough [Sun, 8 Sep 2013 14:19:27 +0000 (07:19 -0700)]
Merge pull request #187 from github/theme-font-diag-fix

Resolve GitHub slide deck theme and diagram issues

10 years agoNewline at end of file. Formatting best practice.
Matthew McCullough [Sun, 8 Sep 2013 03:19:58 +0000 (21:19 -0600)]
Newline at end of file. Formatting best practice.

10 years agoFixing unrendered characters in ~ parent reference
Matthew McCullough [Sun, 8 Sep 2013 03:19:31 +0000 (21:19 -0600)]
Fixing unrendered characters in ~ parent reference

10 years agoAdd section on GHfW and msysGit bug where origin remote can't be removed
Matthew McCullough [Sun, 8 Sep 2013 02:59:46 +0000 (20:59 -0600)]
Add section on GHfW and msysGit bug where origin remote can't be removed

10 years agoFoundations class, not advanced
Matthew McCullough [Sun, 8 Sep 2013 02:36:56 +0000 (20:36 -0600)]
Foundations class, not advanced

10 years agoPrivate GitHub class notes
Matthew McCullough [Sun, 8 Sep 2013 02:35:00 +0000 (20:35 -0600)]
Private GitHub class notes

10 years agoNFJS Seattle Classnotes
Tim Berglund [Sat, 7 Sep 2013 12:48:59 +0000 (05:48 -0700)]
NFJS Seattle Classnotes

10 years agoMerge pull request #200 from github/videos-yt-redirect
Brent Beer [Wed, 4 Sep 2013 07:00:16 +0000 (00:00 -0700)]
Merge pull request #200 from github/videos-yt-redirect

Replace embeded videos redirect

10 years agoReplace embeded videos with redirect to YT GitHubGuides
jordanmccullough [Tue, 3 Sep 2013 21:55:33 +0000 (15:55 -0600)]
Replace embeded videos with redirect to YT GitHubGuides

10 years agoIncrease font size for improved out-of-box legibility
jordanmccullough [Sat, 17 Aug 2013 20:30:47 +0000 (14:30 -0600)]
Increase font size for improved out-of-box legibility

Default font size for all fonts, and that of the code blocks
was too small by default. Default font size now 30 px and
code block fonts forced to 1em (overrides RevealJS caclulated).

10 years agoMerge pull request #197 from github/git-github-order
Jordan McCullough [Tue, 3 Sep 2013 20:00:31 +0000 (13:00 -0700)]
Merge pull request #197 from github/git-github-order

Rearrange word order of "GitHub and Git" in informational/reference documents

10 years agoUpdate word order to "GitHub and Git"
jordanmccullough [Tue, 3 Sep 2013 19:54:42 +0000 (13:54 -0600)]
Update word order to "GitHub and Git"

10 years agoMerge pull request #196 from randomecho/copyedit-gitflow-class-26aug2013
Matthew McCullough [Tue, 3 Sep 2013 14:00:38 +0000 (07:00 -0700)]
Merge pull request #196 from randomecho/copyedit-gitflow-class-26aug2013

Copyedit on Git and GitHub Workflows Class of 26 August 2013

10 years agoMerge pull request #195 from randomecho/fix-classnotes-unix-sneak
Matthew McCullough [Tue, 3 Sep 2013 13:58:37 +0000 (06:58 -0700)]
Merge pull request #195 from randomecho/fix-classnotes-unix-sneak

Fix missing backslash on Wikipedia watch link; Removes repeated links

10 years agoCopyedit on Git and GitHub Workflows Class of 26 August 2013
Soon Van [Tue, 3 Sep 2013 13:53:06 +0000 (09:53 -0400)]
Copyedit on Git and GitHub Workflows Class of 26 August 2013

- Titling raw links to videos, slides and various
  articles on Git workflow for aesthetics.

- Link to Diaspora version has since moved.

- "Ben:" prompts in notes dropped for readability

- Remove blockquote formatting from chat transcript
  section in favour of a italicised version of
  breaking in and showing the question separate
  to its answer.

- Removes questions from Q&A that aren't answered
  so we're not left with cliffhangers like the Sunday
  crossword puzzle. 11d, six letters.

- Also removes the incidental questions and answers
  that aren't technically focussed, the last thanks
  part should hopefully capture that feels.

10 years agoFix missing backslash on Wikipedia watch link; Removes repeated links
Soon Van [Tue, 3 Sep 2013 13:50:17 +0000 (09:50 -0400)]
Fix missing backslash on Wikipedia watch link; Removes repeated links

Links to cheatsheet and .gitignore template were
in two sections, just thought it would be cleaner
if they only appeared once.

10 years agoMerge pull request #194 from github/education-resources
Brent Beer [Fri, 30 Aug 2013 17:44:37 +0000 (10:44 -0700)]
Merge pull request #194 from github/education-resources

start collection of classroom materials

10 years agoUpdate 2013-08-28 Class Notes
Jordan McCullough [Thu, 29 Aug 2013 18:27:46 +0000 (14:27 -0400)]
Update 2013-08-28 Class Notes

Remove stray CLI input that is not relevant to Git commands

10 years agoCreate 2013-08-28-private-foundations.md
Jordan McCullough [Thu, 29 Aug 2013 18:25:55 +0000 (14:25 -0400)]
Create 2013-08-28-private-foundations.md

Add 2013-08-28 Private Foundations Class Notes

10 years agobecause of my ocd
Brent Beer [Wed, 28 Aug 2013 22:02:33 +0000 (15:02 -0700)]
because of my ocd

10 years agoClass notes from 2013-08-26 Workflows class
Matthew McCullough [Wed, 28 Aug 2013 04:52:06 +0000 (22:52 -0600)]
Class notes from 2013-08-26 Workflows class

10 years agoClass notes from 2013-08-26 Workflows class
Matthew McCullough [Wed, 28 Aug 2013 04:52:06 +0000 (22:52 -0600)]
Class notes from 2013-08-26 Workflows class

10 years agostart collection of classroom materials
Brent Beer [Tue, 27 Aug 2013 19:43:23 +0000 (12:43 -0700)]
start collection of classroom materials

10 years agoPrivate class on Aug 26, 2013
Tim Berglund [Tue, 27 Aug 2013 12:20:01 +0000 (05:20 -0700)]
Private class on Aug 26, 2013

10 years ago2013-08-22 Online Foundations Class Notes
Matthew McCullough [Mon, 26 Aug 2013 05:38:10 +0000 (23:38 -0600)]
2013-08-22 Online Foundations Class Notes

10 years agoMac command line install screenshot
Matthew McCullough [Thu, 22 Aug 2013 18:02:22 +0000 (11:02 -0700)]
Mac command line install screenshot

10 years agoMerge pull request #191 from randomecho/usecases-moving-to-git-copyedit
Jordan McCullough [Sun, 25 Aug 2013 15:30:44 +0000 (08:30 -0700)]
Merge pull request #191 from randomecho/usecases-moving-to-git-copyedit

Copy edits on Moving to Git and GitHub use cases, link corrections/updates

10 years agodon't need to show that i ran history command
Brent Beer [Sat, 24 Aug 2013 21:01:32 +0000 (14:01 -0700)]
don't need to show that i ran history command

10 years agoMerge remote-tracking branch 'origin/gh-pages' into gh-pages
Brent Beer [Sat, 24 Aug 2013 20:59:42 +0000 (13:59 -0700)]
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

10 years agoMerge pull request #193 from randomecho/classnotes-links-expanding-foam
Tim Berglund [Fri, 23 Aug 2013 03:22:41 +0000 (20:22 -0700)]
Merge pull request #193 from randomecho/classnotes-links-expanding-foam

Untruncate links found in classnotes transcripts

10 years agoUntruncate links found in classnotes transcripts
Soon Van [Thu, 22 Aug 2013 22:43:17 +0000 (18:43 -0400)]
Untruncate links found in classnotes transcripts

10 years agoMerge pull request #192 from randomecho/videos-undeliciousness
Jordan McCullough [Thu, 22 Aug 2013 15:16:51 +0000 (08:16 -0700)]
Merge pull request #192 from randomecho/videos-undeliciousness

Remove reference to Delicious since bookmarks are on Pinboard

10 years agoRemove reference to Delicious since bookmarks are on Pinboard
Soon Van [Thu, 22 Aug 2013 14:47:10 +0000 (10:47 -0400)]
Remove reference to Delicious since bookmarks are on Pinboard

10 years agoCopyedit on Moving to Git and GitHub use cases
Soon Van [Thu, 22 Aug 2013 14:43:56 +0000 (10:43 -0400)]
Copyedit on Moving to Git and GitHub use cases

- Some 301s or 404 on Testimonials
- Remove reference to Delicious bookmarks
- Italicise questions in Q&A to avoid the odd formatting of bullets
  floating in the air
- Justifications was linking to same page for different reasons

10 years agotrijug github intro talk
Brent Beer [Wed, 21 Aug 2013 00:03:52 +0000 (20:03 -0400)]
trijug github intro talk

10 years agoMerge branch 'gh-pages' into wikipedia-link-fix
Tim Berglund [Mon, 19 Aug 2013 22:36:18 +0000 (15:36 -0700)]
Merge branch 'gh-pages' into wikipedia-link-fix

10 years agoMerge pull request #189 from github/screenshot-youtube-update
Tim Berglund [Mon, 19 Aug 2013 22:35:34 +0000 (15:35 -0700)]
Merge pull request #189 from github/screenshot-youtube-update

Use screenshot of GitHub YouTube channel when not logged in

10 years agoUse screenshot of GitHub YouTube channel when not logged in
Soon Van [Mon, 19 Aug 2013 17:41:07 +0000 (13:41 -0400)]
Use screenshot of GitHub YouTube channel when not logged in

Swaps out the screenshot of the GitHub YouTube channel page
since current is logged in under an account.

The page looks markedly different now as well after their redo.

10 years agoMissing backslash in Wikipedia link to watch command
Soon Van [Mon, 19 Aug 2013 17:36:01 +0000 (13:36 -0400)]
Missing backslash in Wikipedia link to watch command

10 years agoWWC Boulder August 2013
Tim Berglund [Sun, 18 Aug 2013 23:26:48 +0000 (17:26 -0600)]
WWC Boulder August 2013

10 years agoMerge pull request #186 from github/slide-content-tidy
Jordan McCullough [Sat, 17 Aug 2013 22:34:35 +0000 (15:34 -0700)]
Merge pull request #186 from github/slide-content-tidy

Clean up slide content and text

10 years agoUpdate .gitgnore bullet point descriptions
jordanmccullough [Sat, 17 Aug 2013 20:44:26 +0000 (14:44 -0600)]
Update .gitgnore bullet point descriptions

10 years agoRefine description and merge conflict example
jordanmccullough [Sat, 17 Aug 2013 20:42:53 +0000 (14:42 -0600)]
Refine description and merge conflict example

10 years agoMerge pull request #185 from github/revealjs-submod
Matthew McCullough [Sat, 17 Aug 2013 20:41:49 +0000 (13:41 -0700)]
Merge pull request #185 from github/revealjs-submod

Replace RevealJS static copy with Submodule

10 years agoRemove extraneous "one side of" verbiage from Merge example
jordanmccullough [Sat, 17 Aug 2013 20:41:27 +0000 (14:41 -0600)]
Remove extraneous "one side of" verbiage from Merge example

10 years agoAdd RevealJS dependency as submodule
jordanmccullough [Sat, 17 Aug 2013 20:05:57 +0000 (14:05 -0600)]
Add RevealJS dependency as submodule

10 years agoRemoving static copy of RevealJS project
jordanmccullough [Sat, 17 Aug 2013 20:04:54 +0000 (14:04 -0600)]
Removing static copy of RevealJS project

10 years agoMerge pull request #184 from randomecho/course-notes-typo
Matthew McCullough [Sat, 17 Aug 2013 04:29:21 +0000 (21:29 -0700)]
Merge pull request #184 from randomecho/course-notes-typo

Missing preposition in account signup notes; Unhide refspec mention

10 years agoMissing preposition in account signup notes; Unhide refspec mention
Soon Van [Sat, 17 Aug 2013 03:57:16 +0000 (23:57 -0400)]
Missing preposition in account signup notes; Unhide refspec mention

Flattened out the contraction in "Establish a GitHub.com Account"
to help improve the overall sentence flow.

Refspec mention on "Git Beyond the Basics" missing the backticks
which hid the chunk from showing up rendered at:

http://teach.github.com/articles/git-intermediate-course/

10 years agoMerge pull request #183 from github/github-pages-gem
Brent Beer [Tue, 13 Aug 2013 15:46:17 +0000 (08:46 -0700)]
Merge pull request #183 from github/github-pages-gem

Use GitHub Pages Gem

10 years ago:dog: food dat github-pages gem
Ben Balter [Mon, 12 Aug 2013 15:35:03 +0000 (11:35 -0400)]
:dog: food dat github-pages gem

10 years agoFix 08-09-2013 Class Notes CLI header, YAML title
Jordan McCullough [Sat, 10 Aug 2013 20:10:42 +0000 (14:10 -0600)]
Fix 08-09-2013 Class Notes CLI header, YAML title

10 years agoAdd 08-09-2013 Foundations Private Class notes
Jordan McCullough [Sat, 10 Aug 2013 20:09:12 +0000 (14:09 -0600)]
Add 08-09-2013 Foundations Private Class notes

10 years agoMerge pull request #182 from randomecho/classnotes-unspill-log
Jordan McCullough [Sat, 10 Aug 2013 15:13:27 +0000 (08:13 -0700)]
Merge pull request #182 from randomecho/classnotes-unspill-log

Fix up bullet spill on command history for July 2013 Advanced Class

10 years agoFix up bullet spill on command history for July 2013 Advanced Class
Soon Van [Sat, 10 Aug 2013 03:42:28 +0000 (23:42 -0400)]
Fix up bullet spill on command history for July 2013 Advanced Class

10 years agoMerge pull request #181 from github/presentation-source-materials
Tim Berglund [Fri, 9 Aug 2013 05:28:59 +0000 (22:28 -0700)]
Merge pull request #181 from github/presentation-source-materials

Add AI file with slide deck vector diagrams

10 years agoAdd AI file with slide deck vector diagrams
jordanmccullough [Thu, 8 Aug 2013 21:11:22 +0000 (15:11 -0600)]
Add AI file with slide deck vector diagrams

Provides access to raw graphical files for contributes to edit and
adjust as needed for generating PNGs used in slides.

10 years agoUpdated format for auto chat notes
Tim Berglund [Wed, 7 Aug 2013 18:14:27 +0000 (12:14 -0600)]
Updated format for auto chat notes

10 years agoJuly 2013 advanced class notes
Tim Berglund [Wed, 7 Aug 2013 17:57:16 +0000 (11:57 -0600)]
July 2013 advanced class notes

10 years agoMerge pull request #180 from ndp/patch-1
Jordan McCullough [Wed, 7 Aug 2013 05:25:35 +0000 (22:25 -0700)]
Merge pull request #180 from ndp/patch-1

Fix link title for "NDP Software Git Cheatsheet"

10 years agoJust fixing my name; NDP not NPD
Andrew Peterson [Wed, 7 Aug 2013 05:19:04 +0000 (22:19 -0700)]
Just fixing my name; NDP not NPD

10 years agoDes Moines NFJS Advanced Git
Tim Berglund [Sat, 3 Aug 2013 19:56:04 +0000 (14:56 -0500)]
Des Moines NFJS Advanced Git

10 years agoMerge pull request #179 from randomecho/classnotes-watch-slasher
Jordan McCullough [Fri, 2 Aug 2013 23:41:12 +0000 (16:41 -0700)]
Merge pull request #179 from randomecho/classnotes-watch-slasher

Catch a falling backslash on Wikipedia watch link

10 years agoMerge pull request #171 from github/fix-standardization-scripts
Brent Beer [Thu, 1 Aug 2013 18:22:06 +0000 (11:22 -0700)]
Merge pull request #171 from github/fix-standardization-scripts

Fix standardization scripts

10 years agoCatch a falling backslash on Wikipedia watch link
Soon Van [Wed, 24 Jul 2013 01:33:28 +0000 (21:33 -0400)]
Catch a falling backslash on Wikipedia watch link

10 years agoMerge pull request #178 from randomecho/slides-casing-and-typos
Jordan McCullough [Tue, 23 Jul 2013 13:40:11 +0000 (06:40 -0700)]
Merge pull request #178 from randomecho/slides-casing-and-typos

Fix GitHub casing; Normalize use of YAML example, links

10 years agoYAML example uses three dashes; Committing requires two T-shirts
Soon Van [Tue, 23 Jul 2013 03:23:20 +0000 (23:23 -0400)]
YAML example uses three dashes; Committing requires two T-shirts

All other YAML frontmatter marks use three, keep it consistent
with the rest of examples.

Signup link appears to be the only one loaded with http for its
display. Might as well update to its SSL link.

10 years agoUpping the GitHub H with the aid of title frontmatter on slides
Soon Van [Tue, 23 Jul 2013 03:11:45 +0000 (23:11 -0400)]
Upping the GitHub H with the aid of title frontmatter on slides

Since the slide titles can now be explicitly set from the
frontmatter instead of just the raw filename, a good way
to keep the H puffed.

And the YAML all caps as needed.

Not to mention a stray question mark back.

10 years agoOSCON 2013 workshop
Tim Berglund [Mon, 22 Jul 2013 22:50:23 +0000 (15:50 -0700)]
OSCON 2013 workshop

10 years agoUberConf Git from the Bits Up
Tim Berglund [Mon, 22 Jul 2013 15:55:13 +0000 (08:55 -0700)]
UberConf Git from the Bits Up

10 years agoUberConf notes
Tim Berglund [Tue, 16 Jul 2013 23:16:00 +0000 (17:16 -0600)]
UberConf notes

10 years agofixed merge conflicts from gh-pages
Brent Beer [Mon, 22 Jul 2013 22:00:32 +0000 (15:00 -0700)]
fixed merge conflicts from gh-pages

10 years agoRemove zero-indexed class from ordered list
jordanmccullough [Mon, 22 Jul 2013 17:54:26 +0000 (11:54 -0600)]
Remove zero-indexed class from ordered list

10 years agoFix slide markdown formatting errors
jordanmccullough [Mon, 22 Jul 2013 17:40:12 +0000 (11:40 -0600)]
Fix slide markdown formatting errors

10 years agoMerge pull request #174 from github/slide-plugin-update
Jordan McCullough [Mon, 22 Jul 2013 00:32:41 +0000 (17:32 -0700)]
Merge pull request #174 from github/slide-plugin-update

Update HydeSlide Plugins submodule with UI/functionality fixes

10 years agoAdd backtick quotes to Filter-Branch slides to fix Markdown rendering
jordanmccullough [Sun, 21 Jul 2013 01:06:35 +0000 (19:06 -0600)]
Add backtick quotes to Filter-Branch slides to fix Markdown rendering

10 years agoMerge pull request #175 from github/tree-diagram-fix
Jordan McCullough [Sat, 20 Jul 2013 22:43:57 +0000 (15:43 -0700)]
Merge pull request #175 from github/tree-diagram-fix

Fix commit tree diagram typos/errors

10 years agoMerge pull request #176 from randomecho/classnotes-stljug
Jordan McCullough [Fri, 19 Jul 2013 19:56:20 +0000 (12:56 -0700)]
Merge pull request #176 from randomecho/classnotes-stljug

Typos, link updates, grammar correction in classnote files.

10 years agoTypos and sentence framing on STLJUG classnotes
Soon Van [Fri, 19 Jul 2013 19:41:05 +0000 (15:41 -0400)]
Typos and sentence framing on STLJUG classnotes

- Also that Watch Wikipedia article backslash and
  the Perforce KB article at a new URL

- capital Beer