forked from Nixius/template
46 lines
1.1 KiB
Plaintext
46 lines
1.1 KiB
Plaintext
---
|
|
description:
|
|
globs:
|
|
alwaysApply: false
|
|
---
|
|
<!-- build 0 -->
|
|
# Git Workflow
|
|
|
|
This document describes the standard git workflow for this project.
|
|
|
|
## Commit Guidelines
|
|
|
|
1. Use descriptive commit messages
|
|
2. Use 'FIXUP:' prefix for quick fixes to existing code
|
|
3. Add 'HOTFIX:' prefix for emergency fixes
|
|
4. Document significant changes in your commit message
|
|
|
|
## Efficient Git Commands
|
|
|
|
Always use the one-liner command to save time when committing changes:
|
|
|
|
```bash
|
|
git add . && git commit -m "Your message here" && git push
|
|
```
|
|
|
|
### Fixing Previous Commits
|
|
|
|
When fixing issues in previous commits, use the FIXUP prefix:
|
|
|
|
```bash
|
|
git add . && git commit -m "FIXUP: Brief description of the fix" && git push
|
|
```
|
|
|
|
## Branch Strategy
|
|
|
|
- `main` - Main development branch
|
|
- `staging` - For staging environment testing
|
|
- `production` - Production-ready code
|
|
|
|
## Quick Reference
|
|
|
|
Common patterns:
|
|
- New feature: `git add . && git commit -m "Add new feature X" && git push`
|
|
- Bug fix: `git add . && git commit -m "FIXUP: Fix issue with X" && git push`
|
|
- Emergency: `git add . && git commit -m "HOTFIX: Resolve critical issue X" && git push`
|