From 84b18418f1ff6c2caa316e19b0d0bc401a11b8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= Date: Fri, 12 Mar 2010 04:38:29 +0100 Subject: [PATCH] Add "reword" and "fixup" commands used by git rebase -i --- en/history.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en/history.txt b/en/history.txt index 504a9d31..156bbe3c 100644 --- 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: