# Git Git stores everything in a directory, `rm -rf .git` to delete the git project `git --help command` ## Changing History #### Reflog Saves every instance of head changes ```bash git reflog #see list of head changes #Alternate ways to jump to reflog HEADS git checkout -b after-commit HEAD@{1} git reset HEAD@{1} ``` #### Get specific file from past ```bash git checkout -- /path/to/dir/orfile.js ``` #### Rebase * rewrites history, if commits not local can mess things up * could also rebase all your branch commits to occur at end of current master to **avoid a merge commit** `git rebase master`, rebases current branch to master one #### Merge master in your branch before push `git pull --rebase origin master` #### Squash many commits to one `git rebase -i ` 1. `S`quash all but top 2. quit-save to rebase ### Stash `git stash` - Takes dirty changes and saves them without committing `git stash pop` - Reapply last saved changes ```bash git stash list --stat stash@{0}: WIP on 01-20-trigger_smart_read_and_update_state: 1536e62582 Trigger smart read and update state .../src/entrypoints/background/smart-autofill-handler.ts | 113 +++++++++++++++++++++++++++++ apps/extension/src/utils/latent-console.ts | 1 + 2 files changed, 114 insertions(+) stash@{1}: WIP on 01-20-trigger_smart_read_and_update_state: 250f5a9e67 Trigger smart read and update state apps/extension/src/entrypoints/background/smart-autofill-handler.ts | 2 ++ apps/extension/src/utils/latent-console.ts | 1 + 2 files changed, 3 insertions(+) ``` `git stash apply stash@{2}` #### Undoing Last Commit `git reset --hard HEAD~1` => don't keep changes `git reset --soft HEAD~1` => undo commit, but keep working changes `git revert ` =>Commit a commit undoing last commit ## Remotes `git remote -v` => List origins #### Add remote `git remote add origin [github url]` #### Selecting branch to push from and to ```bash git push origin develop:master git push : ``` #### Reset to remote branch `git checkout -B master origin/master` //-B resets if it already exists ## Other **List Branches By Last Modified** ```bash for k in $(git branch | perl -pe s/^..//); do echo -e $(git show --pretty=format:"%Cgreen%ci %Cblue%cr%Creset" $k -- | head -n 1)\\t$k; done | sort -r ``` #### Tagging `git tag -a v1.4 -m "my version 1.4"` #### Delete branches `git branch -d ` `git remote prune origin` //remove all branches not in origin #### Stop tracking file `git rm --cached ` #### Remove all Untracked files and build products `git clean -fd` //remove everything untracked besides what is ignored by .gitignore `git clean -fdx` //remove all untracked files including those ignored by .gitignore `git clean -fdX` //only remove files ignored by .gitignore ### Find commit that broke it ```bash git bisect start git bisect bad #current version is bad git bisect good v2.6.13 #Starts wizard and checks out midpoint git bisect bad #depending on if good or bad git bisect good ``` #### [Did you just change the case in Mac OSX? That will cause git issues](https://stackoverflow.com/questions/13805750/git-fails-to-detect-renaming) ## Git grep `git grep [string]` find all lines tracked by the git repo with the given string `git grep -n -C 3 TeachApp` Modifiers: * `-n` : show line numbers * `-C 5`: show 5 context lines before and after * `-i`: ignore case ## Git Ignore ``` node_modules/ #any node_modules anywhere /node_modules #only at route */node_modules #in any subdir ``` ## Git Worktree Code isolation have multiple branches in separate directories which allow running agents ```bash # Create a new worktree with a new branch git worktree add ../project-feature-a -b feature-a # Or create a worktree with an existing branch git worktree add ../project-bugfix bugfix-123 # List all worktrees git worktree list # Remove a worktree when done git worktree remove ../project-feature-a ``` This creates a new directory with a separate working copy of your repository. 3 Run Claude Code in each worktree ``` # Navigate to your worktree cd ../project-feature-a # Run Claude Code in this isolated environment claude ``` 4 Run Claude in another worktree ``` cd ../project-bugfix claude ``` 5 Manage your worktrees ``` ``` ## Git LFS(Large File Store) Basically, lets you use large files in github by using fileptrs ### Setup 1. `brew install git-lfs` 2. Track like `git lfs track "*.psd"` or have `.gitattributes` .gitattributes ``` *.jpg filter=lfs diff=lfs merge=lfs -text *.jpeg filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.gif filter=lfs diff=lfs merge=lfs -text *.mp4 filter=lfs diff=lfs merge=lfs -text *.mov filter=lfs diff=lfs merge=lfs -text *.flv filter=lfs diff=lfs merge=lfs -text *.webm filter=lfs diff=lfs merge=lfs -text ``` Thats it, just use normal workflow ### Other people 3. `git lfs install` to get huge assets 4. `git lfs pull` to get lfs --- # 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://openai.gitbook.io/code-cheatsheets/all/bash/git.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.