Rename "stg coalesce" to "stg squash"

[stgit] / stgit / commands / rebase.py

diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index b5a80bb42eb006627f3fd2d1c193840a4d6959f6..a4bc6e7db0fc4d42ec0bcae2f0f7b0a225819978 100644 (file)
--- a/stgit/commands/rebase.py
+++ b/stgit/commands/rebase.py
@@ -19,7 +19,7 @@ import sys, os
 from stgit.argparse import opt
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit.argparse import opt
 from stgit.commands.common import *
 from stgit.utils import *

-from stgit import stack, git
+from stgit import argparse, stack, git

 
 help = 'Move the stack base to another point in history'
 kind = 'stack'
 
 help = 'Move the stack base to another point in history'
 kind = 'stack'


@@ -37,9 +37,10 @@ the rebase by executing the following sequence:
 
 Or if you want to skip that patch:
 
 
 Or if you want to skip that patch:
 

-        $ stg push --undo
+        $ stg undo --hard

         $ stg push next-patch..top-patch"""
 
         $ stg push next-patch..top-patch"""
 

+args = [argparse.commit]

 options = [
     opt('-n', '--nopush', action = 'store_true',
         short = 'Do not push the patches back after rebasing'),
 options = [
     opt('-n', '--nopush', action = 'store_true',
         short = 'Do not push the patches back after rebasing'),