Mercurial > public > mercurial-scm > hg-stable

diff hgext/histedit.py @ 20503:23dc77874191

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: clarify description of fold command N and (N-1) didn't add any information to description of fold. More useful is refering to the commit list as it is displayed in editor.
author Adrian Zgorza?ek <adek@fb.com>
date Thu, 13 Feb 2014 18:05:35 -0800
parents 4778f398ec83
children 5840da876235
line wrap: on
line diff
--- a/hgext/histedit.py	Fri Feb 07 17:24:12 2014 +0100
+++ b/hgext/histedit.py	Thu Feb 13 18:05:35 2014 -0800
@@ -30,10 +30,12 @@
 
  # Edit history between c561b4e977df and 7c2fd3b9020c
  #
+ # Commits are listed from least to most recent
+ #
  # Commands:
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
- #  f, fold = use commit, but fold into previous commit (combines N and N-1)
+ #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #
@@ -49,10 +51,12 @@
 
  # Edit history between c561b4e977df and 7c2fd3b9020c
  #
+ # Commits are listed from least to most recent
+ #
  # Commands:
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
- #  f, fold = use commit, but fold into previous commit (combines N and N-1)
+ #  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
  #  d, drop = remove commit from history
  #  m, mess = edit message without changing commit content
  #
@@ -170,10 +174,12 @@
 # i18n: command names and abbreviations must remain untranslated
 editcomment = _("""# Edit history between %s and %s
 #
+# Commits are listed from least to most recent
+#
 # Commands:
 #  p, pick = use commit
 #  e, edit = use commit, but stop for amending
-#  f, fold = use commit, but fold into previous commit (combines N and N-1)
+#  f, fold = use commit, but fold into previous commit (combines this commit with the one above)
 #  d, drop = remove commit from history
 #  m, mess = edit message without changing commit content
 #