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

Added a more detailed explanation of rebase squashing #9

Merged
merged 1 commit into from Jul 8, 2011
Merged

Added a more detailed explanation of rebase squashing #9

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
15 changes: 15 additions & 0 deletions en/history.txt
View file
Open in desktop
Expand Up @@ -47,6 +47,21 @@ Then:
* `squash` to merge a commit with the previous one. * `squash` to merge a commit with the previous one.
* `fixup` to merge a commit with the previous one and discard the log message. * `fixup` to merge a commit with the previous one and discard the log message.


Commits are listed with the oldest one at the top of the list, and the newest one
at the bottom of the list. ie in the previous example, 5c6eb73 is the oldest commit,
and 5c6eb73 is the newest commit.

When doing a squash, the marked commit is "squashed" into the commit higher up
the list (use the mnemonic "squash up" to remember this). For example, this
would result in a311a64 being "squashed" into 5c6eb73:

pick 5c6eb73 Added repo.or.cz link
squash a311a64 Reordered analogies in "Work How You Want"
pick 100834f Added push target to Makefile

When *squash* is used, both log messages will appear in $EDITOR, allowing you
to reword/combine the log messages; *fixup* will discard the log message.

Save and quit. If you marked a commit for editing, then Save and quit. If you marked a commit for editing, then
run: run:


Expand Down