Git

Transcript

1. Git Strategy git > p4
2. Terminology • origin - Default name of git repo that you cloned from. In most cases this is the remote repo on Stash or Github. • local - Your local version of the cloned origin. • master - Default branch name, can be considered the production ready branch of your project. • new branch - Creates a moveable pointer to the branch you based it off of. In short, a copy.
3. Branching git branch testing
4. Branching HEAD the HEAD is the branch you are currently on
5. Branching git checkout testing Short cut!
 git checkout -b feature
6. Branching touch README.md
 git add README.md
 git commit -m “Added README file”
7. Merging git checkout master
 git merge feature
8. Pushing git push origin master Pushes your local changes to the remote master branch (Stash).
9. Let’s not. • Ideally we do not want to push to master, since this should be your production ready branch. Any additional features and bug fixes should be reviewed before merged into master. ! • In short the process would be more like: • git checkout -b feature • touch README.md • git add README.md • git commit -m “Add README file” • git push origin feature
10. Create pull request
11. Commands git fetch origin
 git add .
 git add got-mail.wav
 git remove got-mail.wav
 git pull origin <branchname>
 git push origin <branchname>
 git reset —-hard <branchname>
 git checkout -b <branchname>
 git status
 git branch
 git branch -a Fetch all references from remote
 Add *all* un-staged files
 Add specific un-staged file
 Remove specific staged file
 git fetch and get merge of specific branch
 Push your local committed changes to remote
 Danger Zone Reset your current branch to another
 Create and switch to new branch
 Display branch and it’s status
 Show local branches and show the one you are on.
 Show local and remote branches and show the one you are on.