Added a more detailed explanation of rebase squashing #9

Merged
merged 1 commit into from Jul 8, 2011

Conversation

Projects
None yet
2 participants
@soniah
Contributor

soniah commented Jul 7, 2011

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 Jul 8, 2011

@blynn

This comment has been minimized.

Show comment Hide comment
@blynn

blynn Jul 8, 2011

Owner

Thanks very much! I made a few edits to make it feel more like my
writing style, and also for consistency, I added a bit more to the
other interactive rebase commands.

-Ben

On Wed, Jul 6, 2011 at 10:26 PM, soniah
reply@reply.github.com
wrote:

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:

Reply to this email directly or view it on GitHub:
#9

Owner

blynn commented Jul 8, 2011

Thanks very much! I made a few edits to make it feel more like my
writing style, and also for consistency, I added a bit more to the
other interactive rebase commands.

-Ben

On Wed, Jul 6, 2011 at 10:26 PM, soniah
reply@reply.github.com
wrote:

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:

Reply to this email directly or view it on GitHub:
#9

@soniah

This comment has been minimized.

Show comment Hide comment
@soniah

soniah Jul 10, 2011

Contributor

No worries! Your edits make it read a lot better. Keep up the good work!

BTW your guide has been really helpful, I'm much better at Git now :-)

Sonia.

On Fri, 8 Jul 2011 02:09:00 -0700, "blynn"
reply@reply.github.com
said:

Thanks very much! I made a few edits to make it feel more like my
writing style, and also for consistency, I added a bit more to the
other interactive rebase commands.

-Ben

On Wed, Jul 6, 2011 at 10:26 PM, soniah
reply@reply.github.com
wrote:

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:

Reply to this email directly or view it on GitHub:
#9

Reply to this email directly or view it on GitHub:
#9 (comment)

Contributor

soniah commented Jul 10, 2011

No worries! Your edits make it read a lot better. Keep up the good work!

BTW your guide has been really helpful, I'm much better at Git now :-)

Sonia.

On Fri, 8 Jul 2011 02:09:00 -0700, "blynn"
reply@reply.github.com
said:

Thanks very much! I made a few edits to make it feel more like my
writing style, and also for consistency, I added a bit more to the
other interactive rebase commands.

-Ben

On Wed, Jul 6, 2011 at 10:26 PM, soniah
reply@reply.github.com
wrote:

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:

Reply to this email directly or view it on GitHub:
#9

Reply to this email directly or view it on GitHub:
#9 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment