Git/Github Workshop

Git/Github workshop given at Charlotte Front-End Developers. The workshop covers getting GIT installed on Mac/Windows/Linux the digs through the bare necessity that you'll need to work with GIT. Towards the end it covered workflow, how to work with Github and these magical things called pull requests.

Transcript

2. Source Control The History of
3. Static Files The History of Source Control
4. FTP The History of Source Control
5. SFTP/SSH The History of Source Control
6. Centralized Version Control The History of Source Control
7. One Repository, Lots of Clients Centralized Version Control
8. CVS Centralized Version Control
9. SVN Centralized Version Control
10. Distributed
    Version Control The History of Source Control
11. Lots of Repos, Lots of Clients Distributed Version Control
12. Faster Distributed Version Control Benefits
13. No Internet
    No Problem Distributed Version Control Benefits
14. Inherit Backups Distributed Version Control Benefits
15. Mercurial (hg) Distributed Version Control
16. GIT Distributed Version Control
17. GIT Install
19. http://git-scm.com/ Install via package files. Available for Mac, Windows, Linux & Solaris Install - Option 1
20. http://windows.github.com/ Easiest way to install GIT on Windows Install - Windows Only
21. http://mxcl.github.com/homebrew/ Homebrew – package manager for OSX Install - Option 3 (Homebrew)
22. $ ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go) Step 1 Install - Option 3 (Homebrew)
23. $ brew install git Step 2 Install - Option 3 (Homebrew)
24. Config Settings
25. $ git config --global user.name "<your name>" Config Settings
26. $ git config --global user.email "<your email>" Config Settings
27. Workflow
28. Actual files you work on. Working Directory
    Workflow
29. Staging area. Index
    Workflow
30. Points to the last commit made. HEAD
    Workflow
31. New Repository
32. $ cd ~/Sites Make a New Repo
33. $ mkdir <directory name> Make a New Repo
34. $ cd <directory name> Make a New Repo
35. $ git init Make a New Repo
36. Clone Repository Copies an existing repository
37. $ cd ~/Sites Clone an Existing Repo
38. $ git clone https://github.com/ charlotte-front-end-developers/ git-tutorial.git Clone an Existing Repo
39. $ cd git-tutorial Clone an Existing Repo
40. Status Check
41. $ git status Status Check List all of the changes that have
    been made but not committed.
42. Add Changes
43. $ git add <filename>.txt Add Changes Adds an individual file and stores them in the Index until you’re ready to commit.
44. $ git add . Add Changes Add all changes.
45. Commit Changes
46. $ git commit -m “Message” Commit Your Changes Commits your changes and updates the HEAD.
47. Logs
48. $ git log Logs Lists the recent history of a repo.
49. $ git log --pretty=oneline Logs Lists the recent history of a repo in a slightly more readable format.
50. $ git log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short Logs Lists the recent history of a repo in
    an extremely more readable format.
51. $ git log --graph -- pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Creset'--abbrev-commit -- date=relative Logs Lists the recent history of a repo in
    an extremely more readable format.
52. Adding Remotes
53. $ git remote add origin <server url> Adding Remotes Useful for adding a remote to a new GIT repo.
54. $ git remote add <remote name> <server url> Adding Multiple Remotes Creates another remote that
    you can pull and push too.
55. Push Changes
56. $ git push origin master Push Your Changes Pushes your changes to the remote. Typically a server or service like Github. Origin is an alias to a URL. Master is simply the default branch.
57. Pulling Changes
58. $ git pull origin master Pulling Changes A pull is two GIT commands in one. It will fetch changes from the remote, then attempt to merge them into your local repo.
59. Branches
60. $ git checkout -b <branch name> Branches Creates a new branch.
61. $ git branch Branches Lists all branches.
62. $ git checkout <branch name> Branches Change to your newly created branch.
63. $ git checkout master $ git merge <branch name> Branches Merge a branch back into your master branch.
64. $ git push origin <feature> Branches Push your branch to the remote.
65. $ git branch -d <branch name> Branches Delete a branch.
66. Revert Commits
67. $ git checkout -- <filename> Revert Commits Undo your changes to an individual file.
68. $ git checkout <id00000> Revert Commits Detach you from what’s in HEAD.
69. $ git checkout -b <branch-name> <id00000> Revert Commits Detach you from what’s in HEAD and create a new branch
70. $ git stash $ git reset --hard <id000000> $ git stash pop Revert Commits Stash your current changes and then reset.
71. $ git reset --hard origin/master Revert Commits Scorched Earth.
72. Aliases
73. $ pico ~/.gitconfig Aliases Aliases are stored in a global
    .gitconfig file in your $HOME folder.
74. [alias] ci = commit cm = commit -am br = branch co = checkout lp = log -p who = shortlog -n -s --no-merges undo = reset --hard lc = log ORIG_HEAD.. --stat --no-merges lg = log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative lf = log --pretty=fuller cleanup = !git gc && git remote prune origin fork = remote add -f Aliases
75. $ git lg Aliases
77. Learn
78. http://try.github.io/ Learn