Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Added a more detailed explanation of rebase squashing #9

Merged
merged 1 commit into from

2 participants

@soniah

diff --git a/en/history.txt b/en/history.txt
index a2447ad..11a87ea 100644
--- a/en/history.txt
+++ b/en/history.txt
@@ -47,6 +47,21 @@ Then:
* squash to merge a commit with the previous one.
* 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 run:
@blynn blynn merged commit f4e68e5 into blynn:master
@blynn
Owner
@soniah
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 7, 2011
  1. @soniah
This page is out of date. Refresh to see the latest.
Showing with 15 additions and 0 deletions.
  1. +15 −0 en/history.txt
View
15 en/history.txt
@@ -47,6 +47,21 @@ Then:
* `squash` to merge a commit with the previous one.
* `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
run:
Something went wrong with that request. Please try again.