search
HomeDevelopment ToolsgitHow to modify history in git

Method: 1. Use the "git commit --amend" command to modify one history record; 2. Use the "git rebase -i specify submission number" command to modify multiple history records; 3. Use "git filter- The range modified by the branch --filer command" command rewrites the history.

How to modify history in git

The operating environment of this article: Windows 10 system, Git version 2.30.0, Dell G3 computer.

How to modify the history of git

Junior player git amend

If you are just submitting Later I found that I was handicapped, so I used git commit --amend to modify the previous commit. After this command is executed, it will remove the previous commit from the current branch, restore the workspace to the state where it was last prepared for submission (while mixing the changes after the last commit), and then display a vim interface for You go and modify the last commit information. After saving in vim, all current modifications will be submitted with new submission information.

This command can only modify the last commit. One command is equivalent to executing the following series of actions:

    $ORIG_HEAD=`git show`#保存当前的这次提交的 commit 号
    $git reset --soft HEAD^#回到最后一次提交准备提交前的状态
    $...#做一些操作和修改
    $git commit -c $ORIG_HEAD#表示用最后一次提交的提交信息来做为提交信息,不过会调出编辑器界面

Intermediate player git rebase

Previous The git commit --amend can only modify the last commit, but when we are on a whim and handicapped all the way, this command cannot save us. At this time, we have to use the killer tool of git rebase -i to help We revise those past events that are unbearable to look back on.

Actually, git rebase -i is not a command specifically used to modify historical records, but a command that allows us to perform rebase operations interactively (that is, one by one), but we can use This command is used to modify the commit history.

The method of using this command is git rebase -i . For example, you can use git rebase -i HEAD~3 to modify this submission, the last submission, and the previous submission three times in total. submit.

How to modify history in git

As shown in the picture, if I submit the changes three times and enter git rebase -i HEAD~3, the following interface will appear:

How to modify history in git

This is a vim editor interface. Let us edit this script. The commands that can be used are the six commands in the comments below. After exiting the page where you are currently editing it, git will perform corresponding operations on the submissions one by one according to this script (starting from the earliest submission).

If you just want to modify the submission information, change all picks to r, and then save with:wq. Then git will let you modify it one by one starting from the earliest submission information.

Among the remaining commands, e will jump out of the vim editor when modifying the corresponding submission. At this time, the HEAD pointer points to this submission. At this time, you can use git commit --amend to make various modifications to this submission. , and then execute git rebase --continue to continue the next operation; s will merge this submission and its parent submission into one submission when modifying the corresponding submission; f is similar to s but will ignore the current submission. Information, directly use the information submitted by the parent; x requires entering the command after x and then executing it when HEAD points to this submission. These commands can also be used to rearrange submissions and split submissions.

Ultimate killer git filter-branch

Suppose we submitted N times, and suddenly found that the email addresses we submitted were all wrong (╯°□° )╯︵ ┻━┻, if you use the previously mentioned command at this time, you will probably be exhausted before the changes are completed. At this time, we can use git filter-branch to rewrite the branch, which can batch each branch. Submit and perform our preset operations.

The basic usage format used by the git filter-branch command is git filter-branch -- 'Command' , different filter will provide different input and output to the command. For example, --msg-filter means modifying the submission information, the original submission information is read from the standard input, and the new submission information is output to the standard output; --tree-filter means modifying the file list, etc. Etc. Finally, there will be a scope for rewriting. For example, git filter-branch --env-filter 'GIT_AUTHOR_EMAIL=john@example.com export GIT_AUTHOR_EMAIL' HEAD can be used to rewrite the mailbox. It is recommended to print it out before calling the command Try one branch and then perform the operation on the branch you want to modify.

Recommended study: "Git Tutorial"

The above is the detailed content of How to modify history in git. For more information, please follow other related articles on the PHP Chinese website!

Statement
The content of this article is voluntarily contributed by netizens, and the copyright belongs to the original author. This site does not assume corresponding legal responsibility. If you find any content suspected of plagiarism or infringement, please contact admin@php.cn
Git: The Technology, GitHub: The PlatformGit: The Technology, GitHub: The PlatformApr 28, 2025 am 12:09 AM

Git is a distributed version control system created by Linus Torvaz in 2005, while GitHub is an online collaboration platform based on Git. Git records file changes through snapshots and supports branch models. GitHub provides tools such as PullRequest to improve collaboration efficiency.

GitHub's Purpose: Version Control, Collaboration, and MoreGitHub's Purpose: Version Control, Collaboration, and MoreApr 27, 2025 am 12:05 AM

GitHub is not just a version control tool, it also provides collaboration, project management and community communication capabilities. 1) Version control: Use Git to track code changes. 2) Collaboration: Submit code changes through PullRequest. 3) Project management: Use Issues and Project sections to manage tasks. 4) Community communication: Learn and communicate through fork and participating in open source projects.

GitHub vs. Git: Understanding the Key DifferencesGitHub vs. Git: Understanding the Key DifferencesApr 26, 2025 am 12:12 AM

Git and GitHub are different tools: Git is a version control system, and GitHub is an online platform based on Git. Git is used to manage code versions, and GitHub provides collaboration and hosting capabilities.

GitHub: Code Hosting, Collaboration, and Version ControlGitHub: Code Hosting, Collaboration, and Version ControlApr 25, 2025 am 12:23 AM

GitHub is a distributed version control system based on Git, providing the core features of version control, collaboration and code hosting. 1) Creating repositories, cloning, committing and pushing changes is the basic usage. 2) Advanced usage includes using GitHubActions for automation, deploying static websites in GitHubPages, and using security features to protect code. 3) Common errors such as merge conflicts, permission issues and network connection issues can be debugged by manually resolving conflicts, contacting the warehouse owner and setting up a proxy. 4) Methods to optimize workflows include using branching strategies, automated testing and CI/CD, code review, and keeping documentation and annotations clear.

Git: The Tool, GitHub: The ServiceGit: The Tool, GitHub: The ServiceApr 24, 2025 am 12:01 AM

Git and GitHub are different tools: Git is a distributed version control system, and GitHub is an online collaboration platform based on Git. Git manages code through workspaces, temporary storage areas and local warehouses, and uses common commands such as gitinit, gitclone, etc. GitHub provides functions such as code hosting, PullRequest, IssueTracking, etc. The basic process includes creating repositories, pushing code, and collaborating with PullRequest.

Git: The Core of Version Control, GitHub: Social CodingGit: The Core of Version Control, GitHub: Social CodingApr 23, 2025 am 12:04 AM

Git and GitHub are key tools for modern software development. Git provides version control capabilities to manage code through repositories, branches, commits and merges. GitHub provides code hosting and collaboration features such as Issues and PullRequests. Using Git and GitHub can significantly improve development efficiency and team collaboration capabilities.

Git: The Version Control System, GitHub: The Hosting PlatformGit: The Version Control System, GitHub: The Hosting PlatformApr 22, 2025 am 12:02 AM

Git is a distributed version control system developed by Linus Torvaz in 2005, and GitHub is a Git-based code hosting platform founded in 2008. Git supports branching and merges through snapshot management files, and GitHub provides pull requests, problem tracking and code review functions to facilitate team collaboration.

Git and GitHub: A Comparative AnalysisGit and GitHub: A Comparative AnalysisApr 21, 2025 am 12:10 AM

Git and GitHub are key tools in modern software development. Git is a distributed version control system, and GitHub is a Git-based code hosting platform. Git's core features include version control and branch management, while GitHub provides collaboration and project management tools. When using Git, developers can track file changes and work together; when using GitHub, teams can collaborate through PullRequests and Issues.

See all articles

Hot AI Tools

Undresser.AI Undress

Undresser.AI Undress

AI-powered app for creating realistic nude photos

AI Clothes Remover

AI Clothes Remover

Online AI tool for removing clothes from photos.

Undress AI Tool

Undress AI Tool

Undress images for free

Clothoff.io

Clothoff.io

AI clothes remover

Video Face Swap

Video Face Swap

Swap faces in any video effortlessly with our completely free AI face swap tool!

Hot Tools

Dreamweaver CS6

Dreamweaver CS6

Visual web development tools

SublimeText3 Linux new version

SublimeText3 Linux new version

SublimeText3 Linux latest version

DVWA

DVWA

Damn Vulnerable Web App (DVWA) is a PHP/MySQL web application that is very vulnerable. Its main goals are to be an aid for security professionals to test their skills and tools in a legal environment, to help web developers better understand the process of securing web applications, and to help teachers/students teach/learn in a classroom environment Web application security. The goal of DVWA is to practice some of the most common web vulnerabilities through a simple and straightforward interface, with varying degrees of difficulty. Please note that this software

MantisBT

MantisBT

Mantis is an easy-to-deploy web-based defect tracking tool designed to aid in product defect tracking. It requires PHP, MySQL and a web server. Check out our demo and hosting services.

Atom editor mac version download

Atom editor mac version download

The most popular open source editor