Skip to content
This repository
Browse code

Merge https://github.com/soniah/gitmagic

  • Loading branch information...
commit 10c69aae98dc25a80bdc7dac89b0468d46bdb87f 2 parents 63d54f1 + f4e68e5
Ben Lynn authored

Showing 1 changed file with 15 additions and 0 deletions. Show diff stats Hide diff stats

  1. +15 0 en/history.txt
15 en/history.txt
@@ -47,6 +47,21 @@ Then:
47 47 * `squash` to merge a commit with the previous one.
48 48 * `fixup` to merge a commit with the previous one and discard the log message.
49 49
  50 +Commits are listed with the oldest one at the top of the list, and the newest one
  51 +at the bottom of the list. ie in the previous example, 5c6eb73 is the oldest commit,
  52 +and 5c6eb73 is the newest commit.
  53 +
  54 +When doing a squash, the marked commit is "squashed" into the commit higher up
  55 +the list (use the mnemonic "squash up" to remember this). For example, this
  56 +would result in a311a64 being "squashed" into 5c6eb73:
  57 +
  58 + pick 5c6eb73 Added repo.or.cz link
  59 + squash a311a64 Reordered analogies in "Work How You Want"
  60 + pick 100834f Added push target to Makefile
  61 +
  62 +When *squash* is used, both log messages will appear in $EDITOR, allowing you
  63 +to reword/combine the log messages; *fixup* will discard the log message.
  64 +
50 65 Save and quit. If you marked a commit for editing, then
51 66 run:
52 67

0 comments on commit 10c69aa

Please sign in to comment.
Something went wrong with that request. Please try again.