Patchwork [4,of,7] histedit: explain basics of histedit commands

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 23, 2015, 9:06 a.m.
Message ID <0e74aefc61b7fc442759.1450861603@waste.org>
Download mbox | patch
Permalink /patch/12282/
State Superseded
Headers show

Comments

timeless@mozdev.org - Dec. 23, 2015, 9:06 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450826513 0
#      Tue Dec 22 23:21:53 2015 +0000
# Node ID 0e74aefc61b7fc4427590c200eec254d036f6f91
# Parent  77ab1997cf96c07f6c244be93ed70844852dde02
histedit: explain basics of histedit commands

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -811,8 +811,21 @@ 
 def histedit(ui, repo, *freeargs, **opts):
     """interactively edit changeset history
 
-    This command edits changesets between an ANCESTOR and the parent of
-    the working directory.
+    This command lets you edit a linear series of changesets (up to
+    and including the working directory, which should be clean).
+    You can::
+
+    - `pick` to [re]order a changeset
+
+    - `drop` to omit changeset
+
+    - `mess` to reword the changeset commit message
+
+    - `fold` to combine it with the preceding changeset
+
+    - `roll` like fold, but discarding this commit's description
+
+    - `edit` to edit this changeset
 
     The value from the "histedit.defaultrev" config option is used as a
     revset to select the base revision when ANCESTOR is not specified.