Mercurial > public > mercurial-scm > hg
diff tests/test-histedit-arguments.t @ 27674:78d86664e3a2
histedit: prefer edit commit, edit message, use commit
Selecting editing commits, rewording commit messages, and
selecting commits are key actions, we will prefer them more
generally in a future commit, this pulls them ahead before
that to make the diffs easier to read.
The remaining commands are left alphabetically sorted
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 23 Dec 2015 21:20:08 +0000 |
| parents | e7ff83b2bcfe |
| children | bb810c8b3eca |
line wrap: on
line diff
--- a/tests/test-histedit-arguments.t Wed Dec 23 21:17:45 2015 +0000 +++ b/tests/test-histedit-arguments.t Wed Dec 23 21:20:08 2015 +0000 @@ -64,12 +64,13 @@ # Commits are listed from least to most recent # # Commands: + # + # e, edit = use commit, but stop for amending + # m, mess = edit commit message without changing commit content # p, pick = use commit - # e, edit = use commit, but stop for amending + # d, drop = remove commit from history # 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 commit message without changing commit content # Run on a revision not ancestors of the current working directory. @@ -293,12 +294,13 @@ # Commits are listed from least to most recent # # Commands: + # + # e, edit = use commit, but stop for amending + # m, mess = edit commit message without changing commit content # p, pick = use commit - # e, edit = use commit, but stop for amending + # d, drop = remove commit from history # 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 commit message without changing commit content # Test --continue with --keep