Git Workflow

Git 工作流

When to use this skill

何时使用此技能

Creating meaningful commit messages
Managing branches
Merging code
Resolving conflicts
Collaborating with team
Git best practices

撰写有意义的提交信息
管理分支
代码合并
解决冲突
团队协作
Git最佳实践

Instructions

操作指南

Step 1: Branch management

步骤1：分支管理

Create feature branch:

bash

undefined

创建功能分支:

bash

undefined

Create and switch to new branch

git checkout -b feature/feature-name

Or create from specific commit

git checkout -b feature/feature-name <commit-hash>


**Naming conventions**:
- `feature/description`: New features
- `bugfix/description`: Bug fixes
- `hotfix/description`: Urgent fixes
- `refactor/description`: Code refactoring
- `docs/description`: Documentation updates

git checkout -b feature/feature-name <commit-hash>


**命名规范**:
- `feature/description`: 新功能
- `bugfix/description`: Bug修复
- `hotfix/description`: 紧急修复
- `refactor/description`: 代码重构
- `docs/description`: 文档更新

Step 2: Making changes

步骤2：进行修改

Stage changes:

bash

undefined

暂存修改:

bash

undefined

Stage specific files

git add file1.py file2.js

Stage all changes

git add .

Stage with patch mode (interactive)

git add -p


**Check status**:
```bash

git add -p


**查看状态**:
```bash

See what's changed

git status

See detailed diff

git diff

See staged diff

git diff --staged

undefined

git diff --staged

undefined

Step 3: Committing

步骤3：提交代码

Write good commit messages:

bash

git commit -m "type(scope): subject

Detailed description of what changed and why.

- Change 1
- Change 2

Fixes #123"

Commit types:

```
feat
```
: New feature
```
fix
```
: Bug fix
```
docs
```
: Documentation
```
style
```
: Formatting, no code change
```
refactor
```
: Code refactoring
```
test
```
: Adding tests
```
chore
```
: Maintenance

Example:

bash

git commit -m "feat(auth): add JWT authentication

- Implement JWT token generation
- Add token validation middleware
- Update user model with refresh token

Closes #42"

撰写优质提交信息:

bash

git commit -m "type(scope): subject

Detailed description of what changed and why.

- Change 1
- Change 2

Fixes #123"

提交类型:

```
feat
```
: 新功能
```
fix
```
: Bug修复
```
docs
```
: 文档更新
```
style
```
: 格式调整，无代码变更
```
refactor
```
: 代码重构
```
test
```
: 添加测试
```
chore
```
: 维护工作

示例:

bash

git commit -m "feat(auth): add JWT authentication

- Implement JWT token generation
- Add token validation middleware
- Update user model with refresh token

Closes #42"

Step 4: Pushing changes

步骤4：推送修改

bash

undefined

bash

undefined

Push to remote

git push origin feature/feature-name

Force push (use with caution!)

git push origin feature/feature-name --force-with-lease

Set upstream and push

git push -u origin feature/feature-name

undefined

git push -u origin feature/feature-name

undefined

Step 5: Pulling and updating

步骤5：拉取与更新

bash

undefined

bash

undefined

Pull latest changes

git pull origin main

Pull with rebase (cleaner history)

git pull --rebase origin main

Fetch without merging

git fetch origin

undefined

git fetch origin

undefined

Step 6: Merging

步骤6：合并代码

Merge feature branch:

bash

undefined

合并功能分支:

bash

undefined

Switch to main branch

git checkout main

Merge feature

git merge feature/feature-name

Merge with no fast-forward (creates merge commit)

git merge --no-ff feature/feature-name


**Rebase instead of merge**:
```bash

git merge --no-ff feature/feature-name


**使用变基替代合并**:
```bash

On feature branch

git checkout feature/feature-name

Rebase onto main

git rebase main

Continue after resolving conflicts

git rebase --continue

Abort rebase

git rebase --abort

undefined

git rebase --abort

undefined

Step 7: Resolving conflicts

步骤7：解决冲突

When conflicts occur:

bash

undefined

发生冲突时:

bash

undefined

See conflicted files

git status

Open files and resolve conflicts

Look for markers:

<<<<<<< HEAD Current branch code

Incoming branch code

feature-branch

<<<<<<< HEAD Current branch code

Incoming branch code

feature-branch

After resolving

git add <resolved-files> git commit # For merge git rebase --continue # For rebase

undefined

git add <resolved-files> git commit # For merge git rebase --continue # For rebase

undefined

Step 8: Cleaning up

步骤8：清理操作

bash

undefined

bash

undefined

Delete local branch

git branch -d feature/feature-name

Force delete

git branch -D feature/feature-name

Delete remote branch

git push origin --delete feature/feature-name

Clean up stale references

git fetch --prune

undefined

git fetch --prune

undefined

Advanced workflows

高级工作流

Interactive rebase

交互式变基

bash

undefined

bash

undefined

Rebase last 3 commits

git rebase -i HEAD~3

Commands in editor:

pick: use commit

reword: change commit message

edit: amend commit

squash: combine with previous

fixup: like squash, discard message

drop: remove commit

undefined

undefined

Stashing changes

暂存修改

bash

undefined

bash

undefined

Stash current changes

git stash

Stash with message

git stash save "Work in progress on feature X"

List stashes

git stash list

Apply most recent stash

git stash apply

Apply and remove stash

git stash pop

Apply specific stash

git stash apply stash@{2}

Drop stash

git stash drop stash@{0}

Clear all stashes

git stash clear

undefined

git stash clear

undefined

Cherry-picking

拣选提交

bash

undefined

bash

undefined

Apply specific commit

git cherry-pick <commit-hash>

Cherry-pick multiple commits

git cherry-pick <hash1> <hash2> <hash3>

Cherry-pick without committing

git cherry-pick -n <commit-hash>

undefined

git cherry-pick -n <commit-hash>

undefined

Bisect (finding bugs)

二分查找（定位Bug）

bash

undefined

bash

undefined

Start bisect

git bisect start

Mark current as bad

git bisect bad

Mark known good commit

git bisect good <commit-hash>

Git will checkout commits to test

Test and mark each:

git bisect good # if works git bisect bad # if broken

When found, reset

git bisect reset

undefined

git bisect reset

undefined

Examples

示例

Example 1: Feature development workflow

示例1：功能开发工作流

bash

undefined

bash

undefined

1. Create feature branch

git checkout main git pull origin main git checkout -b feature/user-profile

2. Make changes

... edit files ...

3. Commit changes

git add src/profile/ git commit -m "feat(profile): add user profile page

Create profile component
Add profile API endpoints
Add profile tests"

git add src/profile/ git commit -m "feat(profile): add user profile page

Create profile component
Add profile API endpoints
Add profile tests"

4. Keep up to date with main

git fetch origin git rebase origin/main

5. Push to remote

git push origin feature/user-profile

6. Create Pull Request on GitHub/GitLab

... after review and approval ...

7. Merge and cleanup

git checkout main git pull origin main git branch -d feature/user-profile

undefined

git checkout main git pull origin main git branch -d feature/user-profile

undefined

Example 2: Hotfix workflow

示例2：紧急修复工作流

bash

undefined

bash

undefined

1. Create hotfix branch from production

git checkout main git pull origin main git checkout -b hotfix/critical-bug

2. Fix the bug

... make fixes ...

3. Commit

git add . git commit -m "hotfix: fix critical login bug

Fixes authentication bypass vulnerability

Fixes #999"

git add . git commit -m "hotfix: fix critical login bug

Fixes authentication bypass vulnerability

Fixes #999"

4. Push and merge immediately

git push origin hotfix/critical-bug

After merge:

5. Cleanup

git checkout main git pull origin main git branch -d hotfix/critical-bug

undefined

git checkout main git pull origin main git branch -d hotfix/critical-bug

undefined

Example 3: Collaborative workflow

示例3：协作工作流

bash

undefined

bash

undefined

1. Update main branch

git checkout main git pull origin main

2. Create feature branch

git checkout -b feature/new-feature

3. Regular updates from main

git fetch origin git rebase origin/main

4. Push your work

git push origin feature/new-feature

5. If teammate made changes to your branch

git pull origin feature/new-feature --rebase

6. Resolve any conflicts

... resolve conflicts ...

git add . git rebase --continue

7. Force push after rebase

git push origin feature/new-feature --force-with-lease

undefined

git push origin feature/new-feature --force-with-lease

undefined

Best practices

最佳实践

Commit often: Small, focused commits
Meaningful messages: Explain what and why
Pull before push: Stay updated
Review before commit: Check what you're committing
Use branches: Never commit directly to main
Keep history clean: Rebase feature branches
Test before push: Run tests locally
Write descriptive branch names: Easy to understand
Delete merged branches: Keep repository clean
Use .gitignore: Don't commit generated files

频繁提交: 小而专注的提交
有意义的信息: 说明变更内容及原因
推送前拉取: 保持代码更新
提交前检查: 确认提交内容
使用分支: 绝不直接提交到主分支
保持历史整洁: 对功能分支使用变基
推送前测试: 本地运行测试
分支名称描述性强: 便于理解
删除已合并分支: 保持仓库整洁
使用.gitignore: 不提交生成文件

Common patterns

常见操作

Undo last commit (keep changes)

撤销最后一次提交（保留变更）

bash

git reset --soft HEAD~1

bash

git reset --soft HEAD~1

Undo last commit (discard changes)

撤销最后一次提交（丢弃变更）

bash

git reset --hard HEAD~1

bash

git reset --hard HEAD~1

Amend last commit

修改最后一次提交

bash

undefined

bash

undefined

Change commit message

git commit --amend -m "New message"

Add files to last commit

git add forgotten-file.txt git commit --amend --no-edit

undefined

git add forgotten-file.txt git commit --amend --no-edit

undefined

View history

查看历史

bash

undefined

bash

undefined

Detailed log

git log

One line per commit

git log --oneline

With graph

git log --oneline --graph --all

Last 5 commits

git log -5

Commits by author

git log --author="John"

Commits in date range

git log --since="2 weeks ago"

undefined

git log --since="2 weeks ago"

undefined

Find commits

查找提交

bash

undefined

bash

undefined

Search commit messages

git log --grep="keyword"

Search code changes

git log -S "function_name"

Show file history

git log --follow -- path/to/file

undefined

git log --follow -- path/to/file

undefined

Troubleshooting

故障排除

Accidentally committed to wrong branch

意外提交到错误分支

bash

undefined

bash

undefined

1. Create correct branch from current state

git branch feature/correct-branch

2. Reset current branch

git reset --hard HEAD~1

3. Switch to correct branch

git checkout feature/correct-branch

undefined

git checkout feature/correct-branch

undefined

Need to undo a merge

需要撤销合并

bash

undefined

bash

undefined

If not pushed yet

git reset --hard HEAD~1

If already pushed (creates revert commit)

git revert -m 1 <merge-commit-hash>

undefined

git revert -m 1 <merge-commit-hash>

undefined

Recover deleted branch

恢复已删除分支

bash

undefined

bash

undefined

Find lost commit

git reflog

Create branch from lost commit

git checkout -b recovered-branch <commit-hash>

undefined

git checkout -b recovered-branch <commit-hash>

undefined

Sync fork with upstream

同步复刻仓库与上游仓库

bash

undefined

bash

undefined

Add upstream remote

git remote add upstream https://github.com/original/repo.git

Fetch upstream

git fetch upstream

Merge upstream main

git checkout main git merge upstream/main

Push to your fork

git push origin main

undefined

git push origin main

undefined

Git configuration

Git 配置

User setup

用户设置

bash

git config --global user.name "Your Name"
git config --global user.email "your.email@example.com"

bash

git config --global user.name "Your Name"
git config --global user.email "your.email@example.com"

Aliases

别名设置

bash

git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit
git config --global alias.st status
git config --global alias.unstage 'reset HEAD --'
git config --global alias.last 'log -1 HEAD'
git config --global alias.lg 'log --oneline --graph --all'

bash

git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit
git config --global alias.st status
git config --global alias.unstage 'reset HEAD --'
git config --global alias.last 'log -1 HEAD'
git config --global alias.lg 'log --oneline --graph --all'

Editor

编辑器设置

bash

git config --global core.editor "code --wait"  # VS Code
git config --global core.editor "vim"           # Vim

bash

git config --global core.editor "code --wait"  # VS Code
git config --global core.editor "vim"           # Vim

git-workflow

Original

Translation

Git Workflow

Git 工作流

When to use this skill

何时使用此技能

Instructions

操作指南

Step 1: Branch management

步骤1：分支管理

Create and switch to new branch

Create and switch to new branch

Or create from specific commit

Or create from specific commit

Step 2: Making changes

步骤2：进行修改

Stage specific files

Stage specific files

Stage all changes

Stage all changes

Stage with patch mode (interactive)

Stage with patch mode (interactive)

See what's changed

See what's changed

See detailed diff

See detailed diff

See staged diff

See staged diff

Step 3: Committing

步骤3：提交代码

Step 4: Pushing changes

步骤4：推送修改

Push to remote

Push to remote

Force push (use with caution!)

Force push (use with caution!)

Set upstream and push

Set upstream and push

Step 5: Pulling and updating

步骤5：拉取与更新

Pull latest changes

Pull latest changes

Pull with rebase (cleaner history)

Pull with rebase (cleaner history)

Fetch without merging

Fetch without merging

Step 6: Merging

步骤6：合并代码

Switch to main branch

Switch to main branch

Merge feature

Merge feature

Merge with no fast-forward (creates merge commit)

Merge with no fast-forward (creates merge commit)

On feature branch

On feature branch

Rebase onto main

Rebase onto main

Continue after resolving conflicts

Continue after resolving conflicts

Abort rebase

Abort rebase

Step 7: Resolving conflicts

步骤7：解决冲突

See conflicted files

See conflicted files

Open files and resolve conflicts

Open files and resolve conflicts

Look for markers:

Look for markers:

<<<<<<< HEAD Current branch code

<<<<<<< HEAD Current branch code

After resolving

After resolving

Step 8: Cleaning up

步骤8：清理操作

Delete local branch

Delete local branch

Force delete