Skip to content

Instantly share code, notes, and snippets.

View zhiyuxia's full-sized avatar

zhiyuxia

1 follower · 10 following
View GitHub Profile
@kevin-smets
kevin-smets / iterm2-solarized.md
Last active July 14, 2025 16:18
iTerm2 + Oh My Zsh + Solarized color scheme + Source Code Pro Powerline + Font Awesome + [Powerlevel10k] - (macOS)

Default

Default

Powerlevel10k

Powerlevel10k

@tnguyen14
tnguyen14 / git-reset-guide.md
Last active January 12, 2024 09:57
The difference between git reset --mixed, --soft and --hard. From http://stackoverflow.com/questions/3528245/whats-the-difference-between-git-reset-mixed-soft-and-hard

When you modify a file in your repository, the change is initially unstaged. In order to commit it, you must stage it—that is, add it to the index—using git add. When you make a commit, the changes that are committed are those that have been added to the index.

git reset changes, at minimum, where your current branch is pointing. The difference between --mixed and --soft is whether or not your index is also modified. So, if we're on branch master with this series of commits:

- A - B - C (master)

HEADpoints to C and the index matches C.

--soft

@g0t4
g0t4 / Reasoning About Async JS.md
Last active August 19, 2024 13:03