Git Vocabulary
-
Bare Repository
- A repository that doesn’t have a working directory.
-
Branch
- An active area of development in Git. The newest commit displays the end of the branch.
-
Blame
- Refers to the most recent alteration to every line in the file. Displays Author, Revision, and Time.
-
Commit
- Record of a moment in Git history containing specifications of a changeset.
-
Checkout
- Process whereby a particular commit is chosen from the repository, and the condition of the file associated with it and the directory tree are reproduced in the working directory.
-
Diff
- The difference in changes between saved changes or two Commits.
-
Detached Head
- State in which a specific commit is checked out rather than a branch.
-
Fetch
- Retrieves the most recent changes in the branch and the local or remote repositories.
-
Hash
- Unique SHA1 code for each Commit.
-
Head
- Name of the Commit at the end of a Branch.
-
Fork
- When you Fork the repository, you can add Commits and add Pull Requests.
-
Index
- A group of files that hold state information.
-
Merge
- Includes changes from named commits (from when their histories split from the current branch) into the current branch.
-
Master
- Git’s default development Branch.
-
Pull Request
- Suggests changes to the Master Branch.
-
Repository
- A group of Commits, Branches, and Tags to identify Commits.
-
Push
- Pushes new changes once they’ve been committed.
-
Working Tree
- The directory of files that you are currently working on.
-
Origin
- Default Upstream Repository.
Git Setup
-
Initialize an empty Git repository:
git init -
Clone a repository (local or remote via HTTP/SSH):
git clone [repo / URL] -
Clone the repository from GitHub to the project folder:
git clone [repo / URL] [folder]
Git Configuration
-
Configure the username to be used for all actions:
git config --global user.name "[your_name]" -
Configure the email to be used for all actions:
git config --global user.email "[email_address]" -
Create an alias for a Git command:
git config --global alias.[alias_name] [git_command] -
Set a default text editor:
git config --system core.editor [text_editor] -
Open Git’s global configuration file:
git config --global --edit -
Enable the helpful colorization of command line outputs:
git config --global color.ui auto
Managing Files
-
List which files are staged, unstaged, and untracked:
git status -
Show history of changes:
git log -
List all commits from all branches:
git log --all -
Compare two branches by showing which commits from the first branch are missing from the second branch:
git log [branch1]..[branch2] -
To see the difference between the last commit and the working directory:
git diff HEAD -
Display the content and metadata of an object (blob, tree, tag, or commit):
git show [object] -
To see the difference between the working directory and the index:
git diff -
To see the difference between the last commit and the index:
git diff --cached
Git Branches
-
List all branches in the repository:
git branch -
Create a new branch:
git branch [branch] -
List all branches - local and remote:
git branch -a -
List all remote branches:
git branch -aa -
Switch to a branch under a specified name:
git checkout [branch] -
Rename a branch:
git branch -m [new_branch_name] -
Delete a local branch:
git branch -d [branch] -
Merge a branch:
git merge [branch]
Making Changes
-
Add the current changes of a file to staging:
git add [file/directory] -
Add the entire directory changes to staging:
git add . -
Commit the changes with a message:
git commit -m "[descriptive_message]"
Rewriting History
-
Replace the last commit with a combination of the staged changes and the last commit combined:
git init -
Rebase the current branch with the specified base (It can be a branch name, reference to a head, tag, or a commit ID):
git rebase [base] -
Lists changes made to the HEAD of the local repository:
git reflog
Undoing Changes
-
Undo all changes in the specified file/directory by creating a new commit and applying it to the current branch:
git revert [file/directory] -
Unstage the specified file without overwriting changes:
git reset [file] -
Undo all changes that happened after a specified commit:
git reset [commit] -
See which files should be removed from the current directory:
git clean -n -
Remove the unnecessary files in the directory:
git clean -f
Remote Repositories
-
Remove the unnecessary files in the directory:
git remote add [name] [URL] -
Fetch a branch from a remote repository:
git fetch [remote_repo] [branch] -
Fetch the specified repository and merge it with the local copy:
git pull [remote_repo] -
Push a branch to a remote repository with all its commits and objects:
git push [remote_repo] [branch]
In the fast-paced world of software development, mastering Git is an invaluable skill. With this Git Commands Cheat Sheet, you have a powerful resource at your fingertips to streamline your version control workflow, whether you're a beginner or an experienced developer. Git empowers collaboration, helps you manage your project history, and ensures code integrity.
Remember, Git is not just a tool; it's a journey. As you continue to explore its capabilities and best practices, you'll unlock new ways to work more efficiently and collaboratively with your team. So, keep this cheat sheet handy, and may your coding adventures be filled with success and innovation.
Happy coding! 🚀👨💻👩💻
Top comments (0)