Git basic commands
Download as PPTX, PDF0 likes641 views
This document provides an introduction and overview of the key concepts and commands in Git version control system. It explains how Git differs from other version control systems by being decentralized and having nearly every operation be local. It outlines the basic Git workflow involving the working directory, staging area, and committed snapshots. It then describes and provides examples for common Git commands like init, config, add, commit, push, checkout, log, and branching. It also covers undoing changes, rewriting history, and modifying files in a pushed commit.
Git basic commands
- 1. Introduction to Git Adarsh Konchady
- 2. Git v/s other VCS? • Git is decentralized • Nearly every operation is local. • Git thinks differently about its data. • Branching is simplified
- 3. Git workflow Committed region (snapshots) Staging area Working directory Commit Add Central repository Push Local to each user
- 4. git init • Create a new repository • Usage: o git init • Initialize a repo with .git o git init <directory> • Creates a empty git repo
- 5. git config • git config --global user.name <firstName lastName> • git config --global user.email <email> • git config --global credential.helper wincred o Cache password • Config paths: o <repo>/.git/config – Repository-specific settings. o ~/.gitconfig – User-specific settings. This is where options set with the --global flag are stored. o $(prefix)/etc/gitconfig – System-wide settings.
- 6. git status • Status of the working directory and staging area • Usage: git status
- 7. git add • Add a untracked/modifed file to staging area • git add <file>
- 8. git commit • Put the staged snapshot into the committed history • git commit -m “commit message” • git comit --amend o Combine the staged changes with the previous commit and replace the previous commit with the resulting snapshot.
- 9. git push • Usage o git push • git push --set-upstream origin <branch> o Pushes commits to <branch> • Push a specific commit o git push <remotename> <commit SHA>:<remotebranchname> o Note that this pushes all commits up to and including the commit you choose. If you don't want that to happen, you should first use ’git rebase –I’ to re-order the commits. • While pushing a new repo, 2 extra steps: o git remote add origin <repo_url> o git push --set-upstream origin master
- 10. git checkout • git checkout <commit> <file> • Checkout files • git checkout <commit> • Checkout commits • git checkout <branch> • Checkout branch
- 11. git log • git log o Log of the committed history • git log –oneline • git log origin/master..master o Check only unpushed commits
- 12. Undo changes • git reset o – Undoes changes from staging area to match most recent commit • git reset –hard o Reset the staging area and the working directory to match the most recent commit. • git reset <commit> o Move the current branch tip backward to <commit>, reset the staging area to match, but leave the working directory alone. • git revert <commit> o Generate a new commit that undoes all of the changes introduced in <commit>, then apply it to the current branch. • git clean o Removes untracked files from working directory.
- 13. Rewriting history • git commit –amend o Combine the staged changes with the previous commit and replace the previous commit with the resulting snapshot. • git rebase <base> o Rebase the current branch onto <base>, which can be any kind of commit reference (an ID, a branch name, a tag, or a relative reference to HEAD).
- 14. Branching • git branch o Create a new branch • git checkout –b <branch> o Create a new branch and switch into it • git branch --merged o Show only merged branches • git branch --no-merged o Show only unmerged branches • git branch -d <branch> o Delete a branch • git branch -D <branch> o Force delete a branch even if it has not been merged yet
- 15. Modifying files in a pushed commit • http://stackoverflow.com/a/28173964/802651 • Steps : • git checkout <commit_id> <path_to_file> • Modify the files that you want to undo/change • git commit -am "remove unwanted files“ • Find commitId where files were added mistakenly • git rebase 35c23c2~1 -i // notice: "~1" is necessary • pick 35c23c2 the first commit • fixup 0d78b28 remove unwanted files • If you unfortunately get conflicts, resolve them manually.
Editor's Notes
- #13: git reset <commit> Move the current branch tip backward to <commit>, reset the staging area to match, but leave the working directory alone. All changes made since <commit> will reside in the working directory, which lets you re-commit the project history using cleaner, more atomic snapshots. git reset --hard <commit> Move the current branch tip backward to <commit> and reset both the staging area and the working directory to match. This obliterates not only the uncommitted changes, but all commits after <commit>, as well.