Merge branch 'newtext' of git://github.com/sunny256/gitmagic

vnwildman · Mar 12, 2010 · f392970 · f392970
2 parents 5bccb0b + 84b1841
commit f392970
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/en/history.txt b/en/history.txt
@@ -45,7 +45,9 @@ Then:
 - Remove commits by deleting lines.
 - Reorder commits by reordering lines.
 - Replace "pick" with "edit" to mark a commit for amending.
+- Replace "pick" with "reword" to change the log message.
 - Replace "pick" with "squash" to merge a commit with the previous one.
+- Replace "pick" with "fixup" to merge a commit with the previous one and discard the log message.
 
 If you marked a commit for editing, then run: