Mercurial > hg
diff tests/test-histedit-bookmark-motion.t @ 22152:d2a5986cb89d
histedit: add "roll" command to fold commit data and drop message (issue4256)
This new histedit command (short for "rollup") is a variant of "fold" akin to
"hg amend" for working copy: it accumulates changes without interrupting
the user and asking for an updated commit message.
author | Mike Edgar <adgar@google.com> |
---|---|
date | Wed, 06 Aug 2014 16:51:41 -0400 |
parents | 5840da876235 |
children | aa4a1672583e |
line wrap: on
line diff
--- a/tests/test-histedit-bookmark-motion.t Tue Aug 12 09:39:14 2014 -0700 +++ b/tests/test-histedit-bookmark-motion.t Wed Aug 06 16:51:41 2014 -0400 @@ -73,6 +73,7 @@ # p, pick = use commit # e, edit = use commit, but stop for amending # f, fold = use commit, but combine it with the one above + # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history # m, mess = edit message without changing commit content # @@ -133,6 +134,7 @@ # p, pick = use commit # e, edit = use commit, but stop for amending # f, fold = use commit, but combine it with the one above + # r, roll = like fold, but discard this commit's description # d, drop = remove commit from history # m, mess = edit message without changing commit content #