stg squash: Improve documentation

In particular, mention how the order of the given patches matter, and
exactly what happens in case of conflict.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/squash.py b/stgit/commands/squash.py
index f499037c5e83b9e819d41aed32fc073166cd76a3..d0be46674b3f50c2421e85557f33b7b02f7d6e9f 100644 (file)
--- a/stgit/commands/squash.py
+++ b/stgit/commands/squash.py
@@ -28,11 +28,23 @@ kind = 'stack'
 usage = ['[options] <patches>']
 description = """
 Squash two or more patches, creating one big patch that contains all
 usage = ['[options] <patches>']
 description = """
 Squash two or more patches, creating one big patch that contains all

-their changes.
+their changes. In more detail:

 
 

-If there are conflicts when reordering the patches to match the order
-you specify, you will have to resolve them manually just as if you had
-done a sequence of pushes and pops yourself."""
+  1. Pop all the given patches, plus any other patches on top of them.
+
+  2. Push the given patches in the order they were given on the
+     command line.
+
+  3. Squash the given patches into one big patch.
+
+  4. Allow the user to edit the commit message of the new patch
+     interactively.
+
+  5. Push the other patches that were popped in step (1).
+
+Conflicts can occur whenever we push a patch; that is, in step (2) and
+(5). If there are conflicts, the command will stop so that you can
+resolve them."""

 
 args = [argparse.patch_range(argparse.applied_patches,
                              argparse.unapplied_patches)]
 
 args = [argparse.patch_range(argparse.applied_patches,
                              argparse.unapplied_patches)]