


In daily programming collaboration, the quality of Git commit records often reflects an engineer's engineering literacy. However, I frequently see some non-standard commit records that are quite embarrassing.
For example:
This is likely due to making changes after a commit and casually reusing the previous git commit command.
While this might be acceptable in personal repositories, it's somewhat unprofessional in collaborative repositories.
In my opinion, these commit records are unnecessary, represent bad habits, and can be completely avoided.
Fortunately, Git provides us with an elegant solution. If there's no need to generate a new commit, using git commit --amend can avoid this issue.
Use less git merge and more git rebase
For example:
Merge branch 'feature-A' of https://github.com/qiniu/reviewbot into feature-B
This indicates merging code from remote branch feature-A into feature-B. Here, feature-A is typically the main branch.
Such commit messages are unnecessary in your PR. PR commit messages should only contain useful information about the current changes.
Personally, I rarely use git merge, even for syncing remote branches, I generally use git rebase.
For example:
Besides the above benefits, git rebase helps maintain a very clean commit history in the main repository. Therefore, I strongly recommend using it.
Reviewbot's git commit check
Reviewbot is an open-source project by Qiniu Cloud, aimed at providing a self-hosted code review service for convenient code review/static analysis and implementation of custom engineering standards.
To better regulate these two behaviors, Reviewbot has added git commit check capability to verify if git commit records meet the standards.
If they don't comply with the standards, Reviewbot will notify you:
More git flow practices and tips
Of course, there are many practical techniques in git operations. I encourage interested individuals to explore them. I shared related content with students during the 1024 training camp:
Super Practical! Git Collaboration from a User's Perspective, Say Goodbye to Rote Memorization
The document includes video links for interested readers.
Finally, as professional engineers, we should always pursue excellence in engineering practices. Good commit records not only reflect personal professional quality but are also an important cornerstone for improving team collaboration efficiency.
Through proper use of git rebase and git commit --amend, we can maintain a clearer, more professional code submission history. This not only makes code review easier but also brings great convenience to subsequent code maintenance and issue tracking.
What do you think?
The above is the detailed content of Some git commit histories are really embarrassing, I recommend all engineers to frequently use git rebase and git commit --amend. For more information, please follow other related articles on the PHP Chinese website!

This article explains Go's package import mechanisms: named imports (e.g., import "fmt") and blank imports (e.g., import _ "fmt"). Named imports make package contents accessible, while blank imports only execute t

This article explains Beego's NewFlash() function for inter-page data transfer in web applications. It focuses on using NewFlash() to display temporary messages (success, error, warning) between controllers, leveraging the session mechanism. Limita

This article details efficient conversion of MySQL query results into Go struct slices. It emphasizes using database/sql's Scan method for optimal performance, avoiding manual parsing. Best practices for struct field mapping using db tags and robus

This article explores Go's custom type constraints for generics. It details how interfaces define minimum type requirements for generic functions, improving type safety and code reusability. The article also discusses limitations and best practices

This article demonstrates creating mocks and stubs in Go for unit testing. It emphasizes using interfaces, provides examples of mock implementations, and discusses best practices like keeping mocks focused and using assertion libraries. The articl

This article details efficient file writing in Go, comparing os.WriteFile (suitable for small files) with os.OpenFile and buffered writes (optimal for large files). It emphasizes robust error handling, using defer, and checking for specific errors.

The article discusses writing unit tests in Go, covering best practices, mocking techniques, and tools for efficient test management.

This article explores using tracing tools to analyze Go application execution flow. It discusses manual and automatic instrumentation techniques, comparing tools like Jaeger, Zipkin, and OpenTelemetry, and highlighting effective data visualization


Hot AI Tools

Undresser.AI Undress
AI-powered app for creating realistic nude photos

AI Clothes Remover
Online AI tool for removing clothes from photos.

Undress AI Tool
Undress images for free

Clothoff.io
AI clothes remover

AI Hentai Generator
Generate AI Hentai for free.

Hot Article

Hot Tools

Zend Studio 13.0.1
Powerful PHP integrated development environment

SublimeText3 Chinese version
Chinese version, very easy to use

SublimeText3 Linux new version
SublimeText3 Linux latest version

Notepad++7.3.1
Easy-to-use and free code editor

Dreamweaver CS6
Visual web development tools
