# GitCheatsheet #### Git ## Git Cheat Sheet English #### Index * [Commit History](#commit-history) * [Move / Rename](#move-rename) * [Branches & Tags](#branches-and-tags) * [Merge & Rebase](#merge-and-rebase) * [Undo](#undo) *** ### Search **A text search on all files in the directory:** ``` $ git grep "Hello" ``` **Show commits that introduced a specific keyword** ``` $ git log -S 'keyword' ``` **Show commits that introduced a specific keyword (using a regular expression)** ``` $ git log -S 'keyword' --pickaxe-regex ``` *** ### Commit History **Show all commits, starting with newest (it'll show the hash, author information, date of commit and title of the commit):** ``` $ git log ``` **Show changes over time for a specific file:** ``` $ git log -p ``` **Display commits that are present only in remote/branch in right side** ``` $ git log --oneline .. --left-right ``` **Who changed, what and when in \:** ``` $ git blame ``` *** ### Move / Rename **Rename a file:** Rename Index.txt to Index.html ``` $ git mv Index.txt Index.html ``` *** ### Branches & Tags **List all local branches:** ``` $ git branch ``` **List local/remote branches** ``` $ git branch -a ``` **List all remote branches:** ``` $ git branch -r ``` **Switch HEAD branch:** ``` $ git checkout ``` **Checkout single file from different branch** ``` $ git checkout -- ``` **Create and switch new branch:** ``` $ git checkout -b ``` **Switch to the previous branch, without saying the name explicitly:** ``` $ git checkout - ``` **Create a new branch from an exiting branch and switch to new branch:** ``` $ git checkout -b ``` **Checkout and create a new branch from existing commit** ``` $ git checkout -b ``` **Create a new branch based on your current HEAD:** ``` $ git branch ``` **Create a new tracking branch based on a remote branch:** ``` $ git branch --track ``` **Delete a local branch:** ``` $ git branch -d ``` **Rename current branch to new branch name** ```shell $ git branch -m ``` **Force delete a local branch:** *You will lose unmerged changes!* ``` $ git branch -D ``` **Apply specific commit from another branch:** ``` git cherry-pick ``` ``` ##### List all tags: ``` $ git tag ``` ##### List all tags with their messages (tag message or commit message if tag has no message): ``` $ git tag -n ```
## Update & Publish ##### List all current configured remotes: ``` $ git remote -v ``` ##### Show information about a remote: ``` $ git remote show ``` ##### Add new remote repository, named <remote>: ``` $ git remote add ``` ##### Rename a remote repository, from <remote> to <new_remote>: ``` $ git remote rename \ ``` ##### Remove a remote: ``` $ git remote rm ``` Note: git remote rm does not delete the remote repository from the server. It simply removes the remote and its references from your local repository. ##### Download all changes from <remote>, but don't integrate into HEAD: ``` $ git fetch ``` ##### Download changes and directly merge/integrate into HEAD: ``` $ git remote pull ``` ##### Get all changes from HEAD to local repository: ``` $ git pull origin master ``` ##### Get all changes from HEAD to local repository without a merge: ``` $ git pull --rebase ``` ##### Publish local changes on a remote: ``` $ git push ``` ##### Delete a branch on the remote: ``` $ git push : (since Git v1.5.0) ``` OR ``` $ git push --delete (since Git v1.7.0) ``` ##### Publish your tags: ``` $ git push --tags ````
#### Configure the merge tool globally to meld (editor) ```bash $ git config --global merge.tool meld ```` **Use your configured merge tool to solve conflicts:** ``` $ git mergetool ``` ### Merge & Rebase **Merge branch into your current HEAD:** ``` $ git merge ``` **List merged branches** ``` $ git branch --merged ``` **Rebase your current HEAD onto \:**
*Don't rebase published commit!* ``` $ git rebase ``` **Abort a rebase:** ``` $ git rebase --abort ``` **Continue a rebase after resolving conflicts:** ``` $ git rebase --continue ``` **Use your editor to manually solve conflicts and (after resolving) mark file as resolved:** ``` $ git add ``` ``` $ git rm ``` **Squashing commits:** ``` $ git rebase -i ``` Now replace this, ``` pick pick pick ``` to this, ``` pick squash squash ``` *** ### Undo **Discard all local changes in your working directory:** ``` $ git reset --hard HEAD ``` **Get all the files out of the staging area(i.e. undo the last `git add`):** ``` $ git reset HEAD ``` **Discard local changes in a specific file:** ``` $ git checkout HEAD ``` **Revert a commit (by producing a new commit with contrary changes):** ``` $ git revert ``` **Reset your HEAD pointer to a previous commit and discard all changes since then:** ``` $ git reset --hard ``` **Reset your HEAD pointer to a remote branch current state.** ``` $ git reset --hard e.g., upstream/master, origin/my-feature ``` **Reset your HEAD pointer to a previous commit and preserve all changes as unstaged changes:** ``` $ git reset ``` **Reset your HEAD pointer to a previous commit and preserve uncommitted local changes:** ``` $ git reset --keep ``` **Remove files that were accidentally committed before they were added to .gitignore** ``` $ git rm -r --cached . $ git add . $ git commit -m "remove xyz file" ``` *** --- # Agent Instructions: Querying This Documentation If you need additional information that is not directly available in this page, you can query the documentation dynamically by asking a question. Perform an HTTP GET request on the current page URL with the `ask` query parameter: ``` GET https://wiki.ariitk.in/wiki/tutorials/cheatsheets/git_cheatsheets.md?ask= ``` The question should be specific, self-contained, and written in natural language. The response will contain a direct answer to the question and relevant excerpts and sources from the documentation. Use this mechanism when the answer is not explicitly present in the current page, you need clarification or additional context, or you want to retrieve related documentation sections.