Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions docs/posts/2019/2019-06-19-git-cheat-sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ categories:
comments: true
date:
created: 2019-06-19
updated: 2025-07-12
updated: 2026-06-05
---

# Git Cheat Sheet
Expand Down Expand Up @@ -39,15 +39,16 @@ git config --global alias.rum pull --rebase upstream main
git config --global alias.rud pull --rebase upstream dev
git config --global alias.rom pull --rebase origin main
git config --global alias.rod pull --rebase origin dev
git config --global alias.sync-pr '!git fetch && git reset --hard @{u}'
```

## ~/.bashrc

```bash
alias gitpush='git ci -am "$GIT_MESSAGE" ; git push origin $GIT_BRANCH'
alias gitamendpush='git add . ; git amend ; git push origin $GIT_BRANCH -f'
alias gitrebasemain='git cm ; git rom ; git fetch origin --prune ; if [[ $GIT_BRANCH != "main" ]]; then git br -d $GIT_BRANCH; fi'
alias gitrebasedev='git cd ; git rod ; git fetch origin --prune ; if [[ $GIT_BRANCH != "dev" ]] ; then git br -d $GIT_BRANCH ; fi'
alias gitpush='git ci -am "$gitmsg" ; git push origin $gitbranch'
alias gitamendpush='git add . ; git amend ; git push origin $gitbranch -f'
alias gitrebasemain='git cm ; git rom ; git fetch origin --prune ; if [[ $gitbranch != "main" ]]; then git br -d $gitbranch; fi'
alias gitrebasedev='git cd ; git rod ; git fetch origin --prune ; if [[ $gitbranch != "dev" ]] ; then git br -d $gitbranch ; fi'
```

## Restore
Expand Down Expand Up @@ -381,7 +382,7 @@ echo $all_folders | tr ' ' '\n' | while read -r folder ; \

## bash-git-prompt tweaks

[Some tweaks](../2024/2024-01-05-bash-git-prompt-tweaks.md) I made to [bash-git-prompt](https://github.com/magicmonty/bash-git-prompt). dynamic Python venv path, new var `GIT_MESSAGE`, etc.
[Some tweaks](../2024/2024-01-05-bash-git-prompt-tweaks.md) I made to [bash-git-prompt](https://github.com/magicmonty/bash-git-prompt). dynamic Python venv path, new var `gitmsg`, etc.

## My gitconfig

Expand Down
2 changes: 1 addition & 1 deletion docs/posts/2026/2026-05-08-merkle-hash-trees.md
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ Merkle trees aren't just theory — they power some of the most-used systems on
Instead of: full 1 MB block (~99.96% bandwidth saved)
```

### 📚 Git (Version Control) — Commit Integrity
### 📚 Git (Version Control) — Commit Integrity sdfsdfsdf

**Problem:** How does Git detect if even a single byte of any file in your repo has been tampered with — across millions of commits?

Expand Down
Loading