Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Make a distinction between the rebase commands edit and reword. #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make a distinction between the rebase commands edit and reword. #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions en/history.txt
View file
Open in desktop
Expand Up @@ -51,6 +51,10 @@ Here, 5c6eb73 is the oldest commit, and 100834f is the newest. Then:
* `squash` to merge a commit with the previous one.
* `fixup` to merge a commit with the previous one and discard the log message.

The difference between the `edit` and `reword` commands is that `reword` only
allows you to change the commit message, while `edit` allows you to change the
contents of the commit as well as the commit message.

For example, we might replace the second `pick` with `squash`:

pick 5c6eb73 Added repo.or.cz link
Expand Down