Git Cheat Sheet

Git Cheat Sheet Git Commit Workflow Git Configuration command git config --global user.name "Katia Oleinik" git config --global user.email "koleinik@bu.edu" git config --global cor.editor "nano" description command git add file1 file2 git add . git add -A description add files to staging area add all changes in directory (no deleted files) add all new, modified and delete files to staging area git config --list [--global / --local] git config --list --show-origin list current settings display path to config files git commit -m "Initial commit" git commit create commit with short message create a commit (editor will open) git tag -a v2.15 ae12375 Add a tag to a specific commit Getting help command git help verb man git-verb git verb -h description full manpage for verb full manpage for verb concise help for verb View file source in a commit Creating Local Repository command git init dirname git init git clone /project/scv/dirname git clone https://github.com/bu-rcs/newpkg.git description create a new empty repository a new git repo in an existing folder clone local repository clone remote repository Exploring git repository command tree .git git ls-tree master . description list content of .git directory list content of a git tree object git status git status -sb check status of your repository show status concisely git git git git git git git git show commit log show last 3 commits draw branch graph on the left compact log list commits with specific file modified filter by author filter by date search commit messages log log log log log log log log --3 --graph --oneline -- file1 --author="Katia Oleinik" --after="2019-1-30" --grep="fix" git config --global alias.lg "log --oneline" create an alias git show ae12375 show info about specific commit command git show HEAD:filename git show 0721696:filename git annotate filename description view source of the file in the last commit view source in a specific commit show who made changes to the file Travelling in time command git checkout 0721696 git checkout master description change state to a specific commit go back to the present time Remote repository workflow command git remote add origin url git push origin master git pull origin master description connect local and remote repositories push changes to remote repository pull changes to remote repository Resolving conflicts 1. Make commit 2. git push origin master ( results in error) 3. git pull origin master 4. If editor is opened edit merge commit message. Otherwise edit a file, add and commit it 5. git push origin master Branches Exploring differences/changes command git branch git branch --list git branch -a git branch -v description list all existing branches list all branch names list remote and local branches verbose output git branch branchName git branch -d branchName git branch -D branchName create a new branch delete branch (only if it’s merged) delete branch (even if not merged) git checkout branchName git checkout -b branchName create a new branch create and checkout a new branch git merge branchName merge branchName into current branch Stash command git stash git stash pop git stash list git stash drop description Temporary store modified tracked files restores stashed files list all stashed changes discard most recent shash changes Discard changes remove file from staging area git reset HEAD -- /path/to/file unstage all files git reset