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

login
register
mail settings
Submitter timeless@mozdev.org
Date Jan. 10, 2016, 7:01 p.m.
Message ID <9c11ec13ff85be280b72.1452452481@waste.org>
Download mbox | patch
Permalink /patch/12637/
State Accepted
Headers show

Comments

timeless@mozdev.org - Jan. 10, 2016, 7:01 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450826513 0
#      Tue Dec 22 23:21:53 2015 +0000
# Node ID 9c11ec13ff85be280b72b391fc165413ce960ec3
# Parent  728d8f8c09fe22f41bf8dc05fb1bb973aa50fb3e
histedit: explain basics of histedit commands

This should be hooked into @action via an extended
help argument, but that is future work.

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -871,8 +871,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.