Skip to content

Translate 07-git-tools rewriting-history v2 #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 10, 2015

Conversation

networm
Copy link
Member

@networm networm commented Jul 3, 2015

No description provided.

@networm networm changed the title Translate 07-git-tools rewriting-history Translate 07-git-tools rewriting-history v2 Jul 3, 2015
@networm networm mentioned this pull request Jul 29, 2015
95 tasks
@networm networm modified the milestone: v1.0.0 Jul 29, 2015
One of the great things about Git is that it allows you to make decisions at the last possible moment.
You can decide what files go into which commits right before you commit with the staging area, you can decide that you didn’t mean to be working on something yet with the stash command, and you can rewrite commits that already happened so they look like they happened in a different way.
This can involve changing the order of the commits, changing messages or modifying files in a commit, squashing together or splitting apart commits, or removing commits entirely – all before you share your work with others.
许多时候,当使用 Git 工作时,可能会因为某些原因想要修正提交历史。
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

当使用 Git 工作时 —— 当使用 Git 时


==== The Nuclear Option: filter-branch
==== 核武器选项:filter-branch
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

核武器级选项

@Kyle-ak
Copy link

Kyle-ak commented Aug 3, 2015

@networm 已完成审校

@networm
Copy link
Member Author

networm commented Aug 4, 2015

@Kyle-ak 已修正,部分提出不同意见。

One of the great things about Git is that it allows you to make decisions at the last possible moment.
You can decide what files go into which commits right before you commit with the staging area, you can decide that you didn’t mean to be working on something yet with the stash command, and you can rewrite commits that already happened so they look like they happened in a different way.
This can involve changing the order of the commits, changing messages or modifying files in a commit, squashing together or splitting apart commits, or removing commits entirely – all before you share your work with others.
许多时候,当使用 Git 时,可能会因为某些原因想要修正提交历史。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

当使用 Git 时=》在使用 Git 时

@IceNature
Copy link
Contributor

@networm 已完成

@networm
Copy link
Member Author

networm commented Aug 8, 2015

@IceNature 已修正。


Changing your last commit is probably the most common rewriting of history that you’ll do.
You’ll often want to do two basic things to your last commit: change the commit message, or change the snapshot you just recorded by adding, changing and removing files.
修改你最近一次提交可能是所有修改历史提交的操作中最常见的一个。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

最后,还是最近?求统一。

@Geno1024
Copy link
Contributor

@networm 已审核完毕,并提出 5 个修改建议。

networm added a commit that referenced this pull request Aug 10, 2015
Translate 07-git-tools rewriting-history
@networm networm merged commit a14a173 into progit:master Aug 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants