Podcast
Questions and Answers
Which git log option displays a summarized list of modified files and the number of added or deleted lines for each commit?
Which git log option displays a summarized list of modified files and the number of added or deleted lines for each commit?
- `git log --graph`
- `git log --stat` (correct)
- `git log -p`
- `git log --oneline`
What is the primary function of git rebase -i?
What is the primary function of git rebase -i?
- To interactively rebase the current branch onto another, allowing commit editing. (correct)
- To list all commits in the repository in a condensed format.
- To force a push to the remote repository, ignoring potential conflicts.
- To automatically merge all remote branches into the current branch.
When should the --force flag be used with git push?
When should the --force flag be used with git push?
- When you need to create a new branch on the remote repository.
- When you want to include tags during your push.
- When you want to push all local branches to the remote repository.
- When you are certain about overwriting remote changes and understand the implications. (correct)
What is the purpose of the command git reset --hard?
What is the purpose of the command git reset --hard?
You want to view the commits made by a specific author. Which git log command would you use?
You want to view the commits made by a specific author. Which git log command would you use?
Which command retrieves the remote's version of the current branch and integrates it into the local copy using rebasing?
Which command retrieves the remote's version of the current branch and integrates it into the local copy using rebasing?
What is the purpose of the command git reset without the --hard option?
What is the purpose of the command git reset without the --hard option?
How can you push all of your local branches to a remote repository?
How can you push all of your local branches to a remote repository?
You have made several commits on a feature branch, but now realize they should never have been committed. What is the safest approach to remove these commits from the shared repository, assuming others may have based work on them?
You have made several commits on a feature branch, but now realize they should never have been committed. What is the safest approach to remove these commits from the shared repository, assuming others may have based work on them?
A developer modifies a tracked file in their working directory. Before committing, they want to discard the changes made to the file and revert it to the version in the last commit. What is the most efficient Git command to achieve this?
A developer modifies a tracked file in their working directory. Before committing, they want to discard the changes made to the file and revert it to the version in the last commit. What is the most efficient Git command to achieve this?
A developer has made changes to a file and staged it using git add. They now want to remove the file from the staging area but keep the changes in their working directory. Which command should they use?
A developer has made changes to a file and staged it using git add. They now want to remove the file from the staging area but keep the changes in their working directory. Which command should they use?
You need to inspect the differences between your current working directory and the last commit made on your branch. Which Git command will display these changes?
You need to inspect the differences between your current working directory and the last commit made on your branch. Which Git command will display these changes?
You want to create a shortcut command in Git, such that typing git lg is equivalent to typing git log --graph --oneline. How can you configure this?
You want to create a shortcut command in Git, such that typing git lg is equivalent to typing git log --graph --oneline. How can you configure this?
You need to configure Git to use VS Code as your default text editor for commit messages and other operations requiring text input. Which command achieves this?
You need to configure Git to use VS Code as your default text editor for commit messages and other operations requiring text input. Which command achieves this?
What is the primary function of the git clean -n command?
What is the primary function of the git clean -n command?
You want to retrieve the latest changes from a remote repository named 'origin' for your current branch, and immediately integrate these changes into your local branch. Which Git command accomplishes this in a single step?
You want to retrieve the latest changes from a remote repository named 'origin' for your current branch, and immediately integrate these changes into your local branch. Which Git command accomplishes this in a single step?
You have made several commits on a feature branch, but now realize that these commits should be part of the develop branch. What is the most efficient Git command to integrate these changes while maintaining a clean history?
You have made several commits on a feature branch, but now realize that these commits should be part of the develop branch. What is the most efficient Git command to integrate these changes while maintaining a clean history?
After modifying several files in your working directory, you want to stage only some of the changes for the next commit, while leaving others unstaged. What is the best approach to accomplish this?
After modifying several files in your working directory, you want to stage only some of the changes for the next commit, while leaving others unstaged. What is the best approach to accomplish this?
You've accidentally committed sensitive information to a public Git repository. What steps should you take to remove the sensitive data and ensure it's no longer accessible in the repository's history?
You've accidentally committed sensitive information to a public Git repository. What steps should you take to remove the sensitive data and ensure it's no longer accessible in the repository's history?
You have been working on a feature branch and want to update it with the latest changes from the main branch without creating a merge commit. Which Git command should you use?
You have been working on a feature branch and want to update it with the latest changes from the main branch without creating a merge commit. Which Git command should you use?
You've made a series of commits on your local machine but have not yet pushed them to a remote repository. You realize one of the commits has a mistake. How can you combine the last three commits into a single commit, edit the commit message, and then push them?
You've made a series of commits on your local machine but have not yet pushed them to a remote repository. You realize one of the commits has a mistake. How can you combine the last three commits into a single commit, edit the commit message, and then push them?
What is the primary purpose of the .git directory in a Git repository?
What is the primary purpose of the .git directory in a Git repository?
After accidentally deleting a branch on your local machine, how can you recover it?
After accidentally deleting a branch on your local machine, how can you recover it?
Which command would you use to see a list of all commits reachable from the current commit, displayed in a chronological order?
Which command would you use to see a list of all commits reachable from the current commit, displayed in a chronological order?
Flashcards
git init
git init
Create a new, empty Git repository in the specified directory.
git clone
git clone
Copy a repository from a remote URL to your local machine.
git config user.name
git config user.name
Configure Git settings (e.g., user name, email).
git add
git add
Signup and view all the flashcards
git commit -m
git commit -m
Signup and view all the flashcards
git status
git status
Signup and view all the flashcards
git log
git log
Signup and view all the flashcards
git branch
git branch
Signup and view all the flashcards
git revert
git revert
Signup and view all the flashcards
git fetch
git fetch
Signup and view all the flashcards
git reset
git reset
Signup and view all the flashcards
git pull
git pull
Signup and view all the flashcards
git clean -n
git clean -n
Signup and view all the flashcards
git push
git push
Signup and view all the flashcards
git diff HEAD
git diff HEAD
Signup and view all the flashcards
git diff --cached
git diff --cached
Signup and view all the flashcards
git reset --hard
git reset --hard
Signup and view all the flashcards
git log -
git log -
Signup and view all the flashcards
git log --oneline
git log --oneline
Signup and view all the flashcards
git rebase -i
git rebase -i
Signup and view all the flashcards
git pull --rebase
git pull --rebase
Signup and view all the flashcards
git push --force
git push --force
Signup and view all the flashcards
git push --all
git push --all
Signup and view all the flashcards
Study Notes
- This document serves as a concise Git cheat sheet, offering quick reference to essential commands and concepts that facilitate the use of Git in software development. It aims to help developers efficiently manage their code changes and collaboration.
- Git is a distributed version control system for tracking changes in source code during software development
Git Basics
git init <directory>: Creates an empty Git repository in the specified directory- Running
git initwithout arguments initializes the current directory as a Git repository git clone <repo>: Clones a repository located at<repo>onto the local machine- The original repository can be located on the local file system or on a remote machine via HTTP or SSH
git config user.name <name>: Defines the author name to be used for all commits in the current repository- Developers commonly use the
--globalflag to set configuration options for the current user git add <directory>: Stages all changes in<directory>for the next commit- Replace
<directory>with a<file>to change a specific file git commit -m "<message>": Commits the staged snapshot, using<message>as the commit messagegit status: Lists which files are staged, unstaged, and untrackedgit log: Displays the entire commit history using the default formatgit diff: Shows unstaged changes between your index and working directory
Undoing Changes
git revert <commit>: Creates a new commit that undoes all of the changes made in<commit>, then applies it to the current branchgit reset <file>: Removes<file>from the staging area, but leaves the working directory unchanged- This unstages a file without overwriting any changes
git clean -n: Shows which files would be removed from the working directory- Use the
-fflag in place of the-nflag to execute the clean
Rewriting Git History
git commit --amend: Replaces the last commit with the staged changes and last commit combined- Use with nothing staged to edit the last commit's message
git rebase <base>: Rebases the current branch onto<base><base>can be a commit ID, branch name, a tag, or a relative reference to HEADgit reflog: Shows a log of changes to the local repository's HEAD- Add
--relative-dateflag to show date info or--allto show all refs
Git Branches
git branch: Lists all of the branches in your repository- Add a
<branch>argument to create a new branch with the name<branch> git checkout -b <branch>: Creates and checks out a new branch named<branch>- Drop the
-bflag to checkout an existing branch git merge <branch>: Merges<branch>into the current branch
Remote Repositories
git remote add <name> <url>: Creates a new connection to a remote repository- After adding a remote, use
<name>as a shortcut for<url>in other commands git fetch <remote> <branch>: Fetches a specific<branch>from the repository- Leave off
<branch>to fetch all remote refs git pull <remote>: Fetches the specified remote's copy of current branch and immediately merges it into the local copygit push <remote> <branch>: Pushes the branch to<remote>, along with necessary commits and objects- Creates named branch in the remote repo if it doesn't exist
Additional Options
git config --global user.name <name>: Defines the author name to be used for all commits by the current user globallygit config --global user.email <email>: Defines the author email to be used for all commits by the current user globallygit config --global alias. <alias-name> <git-command>: Creates a shortcut for a Git command- Example: alias.glog "log --graph --oneline" will set "git glog" equivalent to "git log --graph --oneline"
git config --system core.editor <editor>: Sets the text editor used by commands for all users on the machine<editor>argument should be the command that launches the desired editor (e.g., vi)git config --global --edit: Opens the global configuration file in a text editor for manual editinggit log -<limit>: Limits the number of commits by<limit>- Example: "git log -5" will limit to 5 commits
git log --oneline: Condenses each commit to a single linegit log -p: Displays the full diff of each commitgit log --stat: Includes which files were altered and the relative number of lines that were added or deleted from each of themgit log --author="<pattern>": Searches for commits by a particular authorgit log --grep="<pattern>": Searches for commits with a commit message that matches<pattern>git log <since>..<until>: Shows commits that occur between<since>and<until>- Arguments can be a commit ID, branch name, HEAD, or any other kind of revision reference
git log <file>: Only displays commits that have the specified filegit log --graph --decorate: The--graphflag draws a text-based graph of commits on the left side of commit messages, and--decorateadds names of branches or tags of commits showngit diff HEAD: Shows the difference between the working directory and the last commitgit diff --cached: Shows the difference between staged changes and last commitgit reset: Resets the staging area to match the most recent commit, but leaves the working directory unchangedgit reset --hard: Resets the staging area and working directory to match the most recent commit, overwriting all changes in the working directorygit reset <commit>: Moves the current branch tip backward to<commit>, resets the staging area to match, but leaves the working directory alonegit reset --hard <commit>: Same as previous, but resets both the staging area & working directory to match, deleting uncommitted changes, and all commits after<commit>git rebase -i <base>: Interactively rebases current branch onto<base>- Launches editor to enter commands for how each commit will be transferred to the new base
git pull --rebase <remote>: Fetches the remote's copy of current branch and rebases it into the local copy- Uses git rebase instead of merge to integrate the branches
git push <remote> --force: Forces the git push even if it results in a non-fast-forward merge- The
--forceflag should not be used unless you're absolutely sure you know what you're doing git push <remote> --all: Pushes all of your local branches to the specified remotegit push <remote> --tags: Tags aren't automatically pushed when pushing a branch or using the --all flag- The --tags flag sends all of your local tags to the remote repo
Studying That Suits You
Use AI to generate personalized quizzes and flashcards to suit your learning preferences.
