如何修改git已提交記錄的郵箱?


有時候,公司提交的代碼必須使用公司郵箱,而你誤操作,直接把自己個人郵箱提交上去了,此時你就會遇到這樣的需求:如何修改git已提交的郵箱?

而這個需求對於新手來說,往往要花費半天的時間才能理解修改過程,簡直太傻比了,所以我這里做一個詳細的文檔來幫助自己和你搞清楚這個流程。尤其要理解變基,它不是一個命令執行就完成了,而是一連串命令的組合。

步驟1:變基

git rebase -i 

執行后,會打開最近一條的提交記錄,當然上面的命令可以指定某一條記錄,命令是:

git rebase -i "your commit id"

對於sourcetree用戶來說,commit id是SHA-1,可以右鍵某條提交記錄,選擇菜單"復制SHA-1到剪貼板",如下圖:

image-20190513113342522

變基rebase命令執行完成后,會打印類似如下內容:

pick bd81df5 更新API

# Rebase abcb9d0..bd81df5 onto abcb9d0 (1 command)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

新手往往會一臉懵逼,不止所錯,此時是在rebase的過程中,你需要把pick改為edit,如下:

edit bd81df5 更新API

# Rebase abcb9d0..bd81df5 onto abcb9d0 (1 command)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

更改完成后,保存並退出vi編輯器::wq

然后會打印這樣的消息:

chengmingdeMacBook-Pro:server cmlanche$ git rebase -i "abcb9d0d1e99cdad25d8d08119e494436b000e59"
Stopped at bd81df5...  更新API
You can amend the commit now, with

  git commit --amend 

Once you are satisfied with your changes, run

  git rebase --continue
chengmingdeMacBook-Pro:server cmlanche$ 

給大家先科普一下這個amend英文單詞,是修改的意思,對我來說好陌生,為啥不用change或者fix之類的。

image-20190513114137949

上面的信息說了,如果你要amend,也就是要修改這個提交的話,那么用

git commit --amend

如果你對這次修改滿意的話,就用如下命令結束此次變基

git rebase --continue

重置賬戶郵箱信息

我們當然要修改啦,那么執行如下命令,重置提交的賬戶信息:

git commit --amend --author="cmlanche <1204833748@qq.com>" --no-edit

同事,要注意你的sourcetree,出現了新情況!

image-20190513114851415

我們可以看到一個新的提交,並且,郵箱賬號都經過了修改,如果你去掉--no-edit還可以修改commit message,也就是圖中的"更新API",舉栗子吧,我可以繼續用amend修改此次變基

git commit --amend --author="cmlanche <1204833748@qq.com>"

image-20190513115132114

保存退出vi編輯器,看sourcetree咋樣了:

image-20190513115216969

真的很完美,接下來就是合並了,退出變基。

退出變基

git rebase --continue

在控制台中打印如上命令退出變基,我們看到退出變基也就是使用最新的修改了,就一條分支了。

chengmingdeMacBook-Pro:server cmlanche$ git rebase --continue
Successfully rebased and updated refs/heads/bulma.

image-20190513115442779

最后總結一下

變基真的很有用,他不是一條命令搞定的,是一個過程,就像變成中打開了一個輸入流,最后用完你得關閉輸入流一樣。

通過變基你可以輕松實現提交信息的任意重新修改!


免責聲明!

本站轉載的文章為個人學習借鑒使用,本站對版權不負任何法律責任。如果侵犯了您的隱私權益,請聯系本站郵箱yoyou2525@163.com刪除。



 
粵ICP備18138465號   © 2018-2025 CODEPRJ.COM