Skip to content

Update the git tricks with new content #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uekerman merged 2 commits into from
Nov 19, 2025
Merged

Update the git tricks with new content #231

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
119af21
Added two git tricks concerning add and amend
feegeer Oct 27, 2025
30f9473
Fix md formatting
uekerman Nov 19, 2025
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: 13 additions & 0 deletions 01_version_control/my_favorite_neat_little_git_trick_demo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@
- If you rebased/merged and messed up your history, use `git reflog` to go back to a previous state
- If you only need one file from another commit or branch, use `git checkout <branch_or_sha> -- <path>`
- Use [Git LFS](https://git-lfs.com/) for big files >10 MB or for non-diffable binaries (e.g., images, media, archives, shared libraries).
- Prefer `git add -p` over `git add [FILE]`. This allows you to specify what you want to add to a commit in a more fine-grained manner
- A very nice alias for editing any earlier commit, without having to manually rebase:

```
[alias]
amend = "!f() { \
COMMIT=$(git rev-parse --short \"$1\") && \
git commit --fixup \"$COMMIT\" && \
GIT_SEQUENCE_EDITOR=true git rebase --autosquash --autostash --interactive "$COMMIT^"; \
}; f"
```

Usage: e.g. `git add -p ...` and then `git amend HEAD~5`. This would add the staged changes to the fifth last commit.

## Tricks from Winter Term 2024/25

Expand Down