Version control with GIT

(Presented 10/21/2015 at ISISPL; the talk was not recorded)

Now days GIT is widely excepted worldwide by developers. This presentation was head start for the GIT beginner. Even people who already using GIT can also find it useful.

Transcript

1. Version Control with GIT by Vijay Vankhede
2. Agenda • GIT background • Everyday work with GIT • QA
3. Terminology • Repository • Pull / Push / Checkout • Branch • Merge • Conflict • Commit • Revert
4. GIT background • Developed by Linus Torvald • Purpose: to facilitate Linux kernel development • Consider CVS/SVN as the evil
5. Subversion
6. Git
7. A Local Git project has three areas
8. Git file lifecycle
9. Get ready to use Git! 1. Set the name and email for Git to use when you commit: a. $ git config --global user.name “Vijay Vankhede” b. $ git config --global user.email vijay.s.vankhede@gmail.com 2. You can call git config –list to verify these are set. 3. These will be set globally for all Git projects you work with.
10. Create a local copy of a repo To clone an already existing repo to your current directory: a. $ git clone <url> [local dir name] b. $ git init This will create a .git directory in your current directory. Then you can commit files in that directory into the repo: • $ git add file1.java • $ git commit –m “initial project version”
11. Git commands
12. Committing files 1. The first time we ask a file to be tracked, and every time before we commit a file we must add it to the staging area: a. $ git add README.txt hello.java 2. This takes a snapshot of these files at this point in time and adds it to the staging area. 3. To move staged changes into the repo we commit: a. $ git commit –m “Fixing bug #22”
13. 1. Note: To unstage a change on a file before you have committed it: a. $ git reset HEAD -- filename 2. Note: To unmodify a modified file: a. $ git checkout -- filename 3. Note: These commands are just acting on your local version of repo.
14. Status and Diff 1. To view the status of your files in the working directory and staging area: a. $ git status or b. $ git status –s c. (-s shows a short one line version similar to svn) 2. To see what is modified but unstaged: a. $ git diff 3. To see staged changes: a. $ git diff --cached
15. Pulling and Pushing 1. To fetch the most recent updates from the remote repo into your local repo, and put them into your working directory: a. $ git pull origin master 2. To push your changes from your local repo to the remote repo: a. $ git push origin master 3. Notes: origin = an alias for the URL you cloned from a. master = the remote branch you are pulling from/pushing to,
16. Branching 1. To create a branch called experimental: a. $ git branch experimental 2. To list all branches: a. $ git branch 3. To switch to the experimental branch: a. $ git checkout experimental 4. Later on, changes between the two branches differ, to merge changes from experimental into the master: a. $ git checkout master b. $ git merge experimental
17. Do This: • $ git config --global user.name “Your Name” • $ git config --global user.email youremail@whatever.com • $ git clone https://github.com/rea2000/santalist.git Then try: • $ git log, $ git log --oneline • Create a file named userID.txt (e.g. rea.txt) • $ git status, $ git status –s • Add the file: $ git add userID.txt
18. • $ git status, $ git status –s • Commit the file to your local repo: • $ git commit –m “added rea.txt file” • $ git status, $ git status –s, $ git log --oneline • *WAIT, DO NOT GO ON TO THE NEXT STEPS UNTIL YOU ARE TOLD TO!! • Pull from remote repo: $git pull origin master • Push to remote repo: $git push origin master